istruewing@stella.local
c882b87110
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:56:03 +01:00
istruewing@stella.local
0eff6e7be5
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:51:16 +01:00
istruewing@stella.local
44fbe74e1e
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:27:00 +01:00
istruewing@stella.local
c82b842ad8
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-26 09:34:37 +01:00
istruewing@stella.local
fde9b55d61
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-26 09:33:55 +01:00
istruewing@stella.local
97531cadc9
Bug#35559 - plugin_load.test creates warnings
...
plugin_load.test created lines in the warnings files and made
pushbuild cells yellow. Some pushbuild systems are configured
so that they don't build the ha_example plugin. Trying to load
them creates error messages in the error log. These were copied
to the warnings file.
Fixed by ignoring expected error messages for non-existent
ha_example.
2008-03-25 21:30:45 +01:00
svoj@june.mysql.com
2d44db25e7
Merge mysql.com:/home/svoj/devel/mysql/BUG35509/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
2008-03-25 20:28:43 +04:00
mkindahl@dl145h.mysql.com
bc683c6450
Eliminating compiler warnings.
2008-03-25 15:20:42 +01:00
svoj@mysql.com/june.mysql.com
88247fd271
BUG#34789 - drop server/create server leaks memory !
...
BUG#34790 - 'create server' doesn't handle out of memory scenario
well enough
This is an addition to fixes for these bugs, which makes gcov
happy.
2008-03-25 17:37:53 +04:00
svoj@mysql.com/june.mysql.com
b799ea244c
BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode
...
if binlog_format=mixed
Addition to fix for BUG#34768: fixed test case failures discovered
by pushbuild.
2008-03-25 17:28:12 +04:00
svoj@mysql.com/june.mysql.com
f064cd84d5
BUG#35509 - Federated leaks memory when connecting to
...
localhost/default port
When creating federated table that points to unspecified host or
localhost on unspecified port or port is 0, small memory leak occurs.
This happens because we make a copy of unix socket path, which is
never freed.
With this fix we do not make a copy of unix socket path, instead
share->socket points to MYSQL_UNIX_ADDR constant directly.
This fix is covered by a test case for BUG34788.
Affects 5.0 only.
2008-03-25 12:47:57 +04:00
svoj@june.mysql.com
8deb559e21
Merge mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
2008-03-21 12:44:34 +04:00
svoj@june.mysql.com
96f82fd12d
Merge mysql.com:/home/svoj/devel/mysql/push/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
2008-03-21 12:43:14 +04:00
svoj@june.mysql.com
129efd6a03
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
2008-03-20 20:04:48 +04:00
svoj@mysql.com/june.mysql.com
2b552aae50
BUG#34788 - malformed federated connection url is not handled
...
correctly - crashes server !
Creating federated table with connect string containing empty
(zero-length) host name and port is evaluated as 0 (port is
incorrect, omitted or 0) crashes server.
This happens because federated calls strcmp() with NULL pointer.
Fixed by avoiding strcmp() call if hostname is set to NULL.
2008-03-20 19:07:17 +04:00
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
svoj@mysql.com/june.mysql.com
6dfb184f09
BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode if
...
binlog_format=mixed
Statement-based replication of DELETE ... LIMIT, UPDATE ... LIMIT,
INSERT ... SELECT ... LIMIT is not safe as order of rows is not
defined.
With this fix, we issue a warning that this statement is not safe to
replicate in statement mode, or go to row-based mode in mixed mode.
Note that we may consider a statement as safe if ORDER BY primary_key
is present. However it may confuse users to see very similiar statements
replicated differently.
Note 2: regular UPDATE statement (w/o LIMIT) is unsafe as well, but
this patch doesn't address this issue. See comment from Kristian
posted 18 Mar 10:55.
2008-03-18 20:25:34 +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
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
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
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
mkindahl@dl145h.mysql.com
9baeb72ee6
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-03-14 18:32:01 +01: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
mkindahl@dl145h.mysql.com
6a4c4b1850
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-03-14 18:24:02 +01:00
mkindahl@dl145h.mysql.com
f48aa05fd0
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-03-14 18:18:14 +01:00
mkindahl@dl145h.mysql.com
c5fefc688c
Post-merge fixes.
2008-03-14 17:52:57 +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