1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,352 Commits 3,050 Branches 357 Tags
Commit Graph

31352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
holyfoot/hf@mysql.com/deer.(none)
a9a345d9a5 Merge mysql.com:/home/hf/work/mysql-4.1.mrg 
into  mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-07-25 13:50:17 +05:00
joerg@trift2.
e31f8a662c Merge trift2.:/M41/clone-4.1 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 16:30:31 +02:00
joerg@trift2.
1419b5c249 Merge trift2.:/M41/push-1-4.1 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 16:04:40 +02:00
joerg@trift2.
37408ed0f3 Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 15:47:57 +02:00
joerg@trift2.
5ac44f14cb Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 14:06:17 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
95197805e2 Merge bk://anubis/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/merge/mysql-5.0
 2006-07-21 10:14:25 -07:00
tsmith/tim@siva.hindu.god
24f96519de Finish the merge of the patch for bug #15195 from 4.1 -> 5.0 
- Adapt it to work with the handlerton class
 2006-07-20 13:41:00 -06:00
holyfoot/hf@mysql.com/deer.(none)
95b88445fb Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.19983
 2006-07-20 16:03:21 +05:00
tsmith/tim@siva.hindu.god
17cc8acc91 Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed 2006-07-20 00:45:47 -06:00
tnurnberg@salvation.intern.azundris.com
36bf00709e Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
 2006-07-19 19:52:27 +02:00
tnurnberg@salvation.intern.azundris.com
56e1d96122 manual merge, part 2/2 2006-07-19 16:50:55 +02:00
msvensson@neptunus.(none)
9a7d888aa3 Bug #21135 Crash in test "func_time" 
- backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion
 2006-07-19 15:55:04 +02:00
tnurnberg@salvation.intern.azundris.com
199bb148fd Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
 2006-07-19 14:12:30 +02:00
tnurnberg@salvation.intern.azundris.com
b304cb6da8 Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER 
REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.
 2006-07-19 11:49:07 +02:00
patg@govinda.patg.net
71f5b4997a "BUG #18764: Delete conditions causing inconsistencies in Federated tables" 
Post merge changes.
 2006-07-18 18:41:36 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2eacb14d2e mysql.spec.sh: 
Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page
 2006-07-19 02:46:48 +02:00
patg@govinda.patg.net
259f9bb0d7 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2
 2006-07-18 17:21:50 -07:00
evgen@moonbone.local
b7a55b9b5c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 23:45:17 +04:00
evgen@moonbone.local
6dd8772bfc Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-07-18 23:30:09 +04:00
evgen@moonbone.local
ed8eb31412 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 21:32:25 +04:00
evgen@moonbone.local
a8d230c672 Merge moonbone.local:/work/mysql-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-07-18 21:30:26 +04:00
jimw@rama.(none)
8b91a02728 Merge bk-internal:/home/bk/mysql-5.0-engines 
into  rama.(none):/home/jimw/my/mysql-5.0-17608
 2006-07-18 10:25:04 -07:00
evgen@moonbone.local
bb2b48a5d5 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 19:51:22 +04:00
holyfoot/abotchkov@production.mysql.com
fbd94751b8 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
 2006-07-18 14:53:19 +02:00
holyfoot/hf@mysql.com/deer.(none)
00f56da9af merging 2006-07-18 16:43:39 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
483d0e3b4a Backporting Kostja's changes made for 5.0 into 4.1. 
Please use "ul" when merging this changeset to 5.0.
 2006-07-18 15:53:12 +05:00
holyfoot/hf@mysql.com/deer.(none)
bed7b69243 Merge mysql.com:/home/hf/work/mysql-4.1.mrg 
into  mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-07-18 14:52:29 +05:00
msvensson@neptunus.(none)
f0300aff5b Merge neptunus.(none):/home/msvensson/mysql/my50-maint-yassl-20060717 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-07-18 09:52:14 +02:00
patg@govinda.patg.net
51d8bcf627 "BUG #18764: Delete conditions causing inconsistencies in Federated tables" 
Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.
 2006-07-17 16:45:04 -07:00
igor@rurik.mysql.com
31a7bdfcf6 Post-merge fix. 2006-07-17 15:28:24 -07:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35 Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps. 2006-07-17 18:07:08 -04:00
igor@rurik.mysql.com
3d83d5aa03 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-17 13:24:43 -07:00
igor@olga.mysql.com
59e7a26177 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-17 11:41:27 -07:00
joerg@trift2.
c621d4e45c Changes to make "sql/sql_locale.cc" compile + link on Windows: 
1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.
 2006-07-17 20:40:41 +02:00
joerg@trift2.
671019efd6 strings/strtod.c : Ensure the definition of "EOVERFLOW" is available. 
In 5.0, this is already solved, so that is a null-merge ("ul").
 2006-07-17 19:38:46 +02:00
evgen@moonbone.local
b0b1fe3bd8 select.result, select.test: 
Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.
 2006-07-17 16:12:42 +04:00
evgen@moonbone.local
51a636293e mysql.test, mysql.result: 
Corrected the test case after fixing bug#10977
 2006-07-17 14:22:21 +04:00
msvensson@shellback.(none)
0af88d0eb3 Merge shellback.(none):/home/msvensson/mysql/my50-yassl 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-17 11:27:12 +02:00
msvensson@shellback.(none)
011f57e0ec Import yaSSL version 1.3.7 
- Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
 2006-07-17 10:50:20 +02:00
igor@rurik.mysql.com
21469f84ac Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-16 12:10:46 -07:00
evgen@moonbone.local
5431805cc7 errmsg.txt: 
Fixed bug#10977: No warning issued if a column name is truncated
  New warning message is added.
 2006-07-16 01:18:08 +04:00
evgen@moonbone.local
f1346cf8f6 Fixed bug#10977: No warning issued if a column name is truncated 
When an alias is set to a column leading spaces are removed from the alias.
But when this is done on aliases set by user this can lead to confusion.

Now Item::set_name() method issues the warning if leading spaces were removed
from an alias set by user.

New warning message is added.
 2006-07-16 00:45:38 +04:00
pekka@orca.ndb.mysql.com
71b90cc784 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
 2006-07-15 21:54:47 +02:00
pekka@orca.ndb.mysql.com
14519de0fc Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
 2006-07-15 21:44:25 +02:00
igor@rurik.mysql.com
38cd55a758 Fixed bug #20869. 
The bug caused a crash of the server if a subquery with
ORDER BY DESC used the range access method.
The bug happened because the method QUICK_SELECT_DESC::reset
was not reworked after MRR interface had been introduced.
 2006-07-15 00:28:21 -07:00
igor@olga.mysql.com
4de3186ae1 Fixed bug #20519. 
The bug was due to a loss happened during a refactoring made
on May 30 2005 that modified the function JOIN::reinit.
As a result of it for any subquery the value of offset_limit_cnt
was not restored for the following executions. Yet the first 
execution of the subquery made it equal to 0.
The fix restores this value in the function JOIN::reinit.
 2006-07-14 19:28:58 -07:00
kent@mysql.com/g4-2.local
0f11ea9b0b mysql.spec.sh: 
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
 2006-07-15 00:24:35 +02:00
igor@rurik.mysql.com
6e75a11b01 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-14 14:45:23 -07:00
igreenhoe/greenman@anubis.greendragongames.com
20de038887 4.1 -> 5.0 merge 2006-07-14 13:30:23 -07:00
joerg@trift2.
5620f8e0a6 Increment the version number to 4.1.22, as 4.1.21 is cloned. 2006-07-14 17:55:34 +02:00