mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53389 commits 2784 branches 343 tags 1.6 GiB
Commit graph

53389 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@april.(none)
65992efca6 Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines
 2008-03-18 16:39:33 +04:00
svoj@mysql.com/april.(none)
70ca2ae287 Make gcov happy. 2008-03-18 16:38:12 +04:00
mattiasj@witty.
7586a4c6c4 Bug#35306: partition_basic_symlink test failures 
Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)
 2008-03-17 16:18:02 +01:00
mattiasj@witty.
d733351148 Bug#35305: partition_symlink test failures 
Updated the test due to bug 32167

Corrected spelling of error message
 2008-03-17 16:11:26 +01:00
mattiasj@witty.
d918fa6ec9 Valgrind warnings found after bug#32943 and after merge from -main 
into -engines tree.

hander::table_share was not updated after changing table->s.
 2008-03-17 15:56:53 +01:00
antony@pcg5ppc.xiphis.org
c400abe878 make pushbuild green 2008-03-15 01:08:35 -07:00
antony@pcg5ppc.xiphis.org
287d1efefa make pushbuild green 2008-03-14 23:01:46 -07:00
antony@pcg5ppc.xiphis.org
532dc9a2e7 fix results after merge 2008-03-14 18:45:50 -07:00
antony@pcg5ppc.xiphis.org
e6b027f6f3 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-14 15:29:49 -07:00
antony@pcg5ppc.xiphis.org
0b4da8a381 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
 2008-03-14 15:28:36 -07:00
svoj@mysql.com/june.mysql.com
2f4bb0f115 BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed 
After merge fix.
 2008-03-15 00:24:10 +04:00
antony@pcg5ppc.xiphis.org
b8b178c425 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-14 11:26:54 -07:00
antony@pcg5ppc.xiphis.org
80d742ea0d Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
 2008-03-14 11:23:18 -07:00
antony@pcg5ppc.xiphis.org
a05aac7ed2 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-14 11:16:34 -07:00
antony@pcg5ppc.xiphis.org
91e44529bd Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-14 11:13:54 -07:00
antony@pcg5ppc.xiphis.org
98eccfbe10 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
 2008-03-14 10:44:06 -07:00
svoj@june.mysql.com
54d097c433 Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.1-engines
 2008-03-14 20:00:04 +04:00
svoj@june.mysql.com
c3c1fd4d18 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines
 2008-03-14 19:42:44 +04:00
svoj@mysql.com/june.mysql.com
1f0e9f5a5d BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executed 
When there are no underlying tables specified for a merge table,
SHOW CREATE TABLE outputs a statement that cannot be executed. The
same is true for mysqldump (it generates dumps that cannot be
executed).

This happens because SQL parser does not accept empty UNION() clause.

This patch changes the following:
- it is now possible to execute CREATE/ALTER statement with
  empty UNION() clause.
- the same as above, but still worth noting: it is now possible to
  remove underlying tables mapping using ALTER TABLE ... UNION=().
- SHOW CREATE TABLE does not output UNION() clause if there are
  no underlying tables specified for a merge table. This makes
  mysqldump slightly smaller.
 2008-03-14 19:38:22 +04:00
svoj@april.(none)
3a7bcaf7d6 Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
 2008-03-14 17:54:17 +04:00
svoj@mysql.com/april.(none)
243ca22b94 BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if 
log-slave-updates and circul repl

This is a test case fix for BUG#13861.
 2008-03-14 17:17:03 +04:00
kaa@kaamos.(none)
eac3a26efa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-13 12:19:56 +03:00
kaa@kaamos.(none)
3bff5b59c6 Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures 
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.
 2008-03-13 12:14:14 +03:00
kaa@kaamos.(none)
06bf29cf0f Fixed test failures caused by insufficient cleanups in the tests for 
bug12713.
 2008-03-12 16:52:29 +03:00
kaa@kaamos.(none)
11c336b805 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:56:50 +03:00
kaa@kaamos.(none)
28b4988ee4 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:29:50 +03:00
kaa@kaamos.(none)
9c811ddec9 Post-merge fix. 2008-03-12 13:22:58 +03:00
kaa@kaamos.(none)
a48f1d24ab Re-enabled the test for mysql_insert_id() after merging from main. 2008-03-12 12:13:41 +03:00
kaa@kaamos.(none)
ae93d258aa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:21:12 +03:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
815898f3a8 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 11:00:52 +03:00
kaa@kaamos.(none)
d0eb90501d Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 10:59:15 +03:00
kaa@kaamos.(none)
9510da1916 Merge kaamos.(none):/data/src/mysql-4.1 
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
 2008-03-12 10:53:15 +03:00
kaa@kaamos.(none)
7e365efa30 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-11 15:47:16 +03:00
mhansson/martin@riffraff.(none)
3d87b263d9 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
 2008-03-11 11:31:59 +01:00
holyfoot/hf@hfmain.(none)
e0851650e1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/32801/my51-32801
 2008-03-11 11:20:36 +04:00
tnurnberg@white.intern.koehntopp.de
f5b93ab932 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:39:04 +01:00
tnurnberg@white.intern.koehntopp.de
3a87bbfe42 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/34749/50-34749
 2008-03-10 07:11:12 +01:00
tnurnberg@white.intern.koehntopp.de
fd2bae9981 Merge mysql.com:/misc/mysql/34749/50-34749 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:07:56 +01:00
tnurnberg@white.intern.koehntopp.de
10bf47abf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:52:32 +01:00
tnurnberg@white.intern.koehntopp.de
f2b153a2a5 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/29645/50-29645
 2008-03-10 06:48:55 +01:00
tnurnberg@white.intern.koehntopp.de
6ad2340f63 Merge mysql.com:/misc/mysql/29645/50-29645 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:44:31 +01:00
kaa@kaamos.(none)
71d67f7f51 Merge kaamos.(none):/data/src/opt/bug34889/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-08 14:21:21 +03:00
kaa@kaamos.(none)
ace5022619 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-08 14:20:55 +03:00
kaa@kaamos.(none)
88a1ab6ce8 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/bug34889/my51
 2008-03-08 11:21:11 +03:00
antony@pcg5ppc.xiphis.org
bdc74bbda7 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 14:07:01 -08:00
antony@pcg5ppc.xiphis.org
bfa8eeaf5a Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 13:48:41 -08:00
antony@pcg5ppc.xiphis.org
820068f1b7 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
 2008-03-07 13:46:29 -08:00
antony@pcg5ppc.xiphis.org
9c4e4640ad Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
 2008-03-07 13:41:11 -08:00
bar@bar.myoffice.izhnet.ru
ba600ac12f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
 2008-03-08 01:15:38 +04:00