istruewing@stella.local
9f3784d23b
Post-merge fix
2008-03-26 16:22:10 +01:00
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
3bb915ea32
Merge mysql.com:/home/svoj/devel/mysql/BUG34790/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
2008-03-21 12:46:01 +04:00
svoj@june.mysql.com
715fcc7bd4
Merge mysql.com:/home/svoj/devel/mysql/BUG34789/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/push/mysql-5.1-engines
2008-03-21 12:45:18 +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
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@mysql.com/june.mysql.com
5309d2a521
BUG#34789 - drop server/create server leaks memory !
...
When CREATE SERVER is issued, it allocates memory on memory root
to store cached server structure. When DROP SERVER is issued,
it doesn't release this memory, as it is impossible with the
memory root.
We use the same allocation strategy for plugins and acl. The problem
here that there was no way (except for the server restart) to force
'servers' code to release this memory.
With this fix it is possible to release unused server cache memory
by FLUSH PRIVILEGES.
No test case for this fix.
2008-03-20 11:57:30 +04:00
svoj@mysql.com/june.mysql.com
0d5bd0c68e
BUG#34790 - 'create server' doesn't handle out of memory scenario
...
well enough
CREATE SERVER may cause server crash if there is not enough memory
to execute this operation.
Fixed that create_server() and prepare_server_struct_for_insert()
didn't check return value of functions that allocate memory.
As this is out of memory issue fix, not test case available.
2008-03-20 11:40:26 +04: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
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