mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53413 commits 2791 branches 343 tags 1.7 GiB
Commit graph

53413 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@stella.local
8c0300dae9 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-20 12:22:02 +01:00
istruewing@stella.local
7157f0d244 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-20 11:33:34 +01:00
istruewing@stella.local
0efc834e8a Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-20 10:57:24 +01:00
istruewing@stella.local
f560b8c89c Merge stella.local:/home2/mydev/mysql-4.1-axmrg 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-20 10:56:53 +01:00
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
kent/mysqldev@mysql.com/production.mysql.com
2536f33120 Raise version number after cloning 4.1.24 2008-03-18 00:57:57 +01: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
istruewing@stella.local
59a2f7b41f Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-16 09:52:37 +01:00
istruewing@stella.local
e1efd0679f Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-15 19:27:17 +01:00
istruewing@stella.local
07ca4d0349 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-15 18:51:32 +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
istruewing@stella.local
cbdd0d2dbc Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-14 21:40:21 +01:00
istruewing@stella.local
b67add660f Post-merge fixes 2008-03-14 21:37:19 +01: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
istruewing@stella.local
26ed736a92 Post-merge fix 2008-03-14 20:51:32 +01:00
istruewing@stella.local
ee9ee8f49d Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-14 19:30:49 +01: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
istruewing@stella.local
397c1783eb Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-14 19:04:02 +01: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
istruewing@stella.local
21e2a00057 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-14 18:28:37 +01:00
istruewing@stella.local
6beb16ed93 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-14 17:52:09 +01:00
istruewing@stella.local
4ea7377356 Post-merge fixes 2008-03-14 17:45:14 +01: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
istruewing@stella.local
857dd49aa8 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-14 14:15:36 +01:00
istruewing@stella.local
ed89b81b3f Post-merge fix. Moved the symlink handling from sql_parse.cc here. 2008-03-14 14:03:47 +01:00
istruewing@stella.local
eabe082d6f Manual merge 2008-03-14 12:02:11 +01:00
istruewing@stella.local
d0b86d23d7 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-14 09:48:57 +01:00
istruewing@stella.local
d5390b2d56 Bug#33756 - query cache with concurrent_insert=0 appears broken 
When concurrent inserts were disabled, statements after an INSERT
were not put into the query cache. This happened because we do not
save the current data file length at statement start when
concurrent inserts are disabled. But we checked the always zero
local length against the real file length anyway.
  
Fixed by doing the check only if concurrent inserts are not diabled.
 2008-03-13 16:39:27 +01: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
istruewing@stella.local
4a5e91cc68 Bug#35247 - rpl_transaction.test produces warnings files 
The test file tried to use a mysqltest command '--warning'
but there is no such command.

Changed '--warning' to '#--warning'.
 2008-03-12 15:38:57 +01: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