kroki@mysql.com
f6c95ee81a
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-05-06 19:45:24 +04:00
kroki@mysql.com
e00d7c1bf3
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-06 18:45:07 +04:00
kroki@mysql.com
b00df53ad5
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-06 18:40:56 +04:00
kroki@mysql.com
bf9ccde948
Fix race condition in the test for bug#16501.
2006-05-06 18:24:41 +04:00
ingo@mysql.com
2d907965ea
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug10405
2006-05-06 15:27:23 +02:00
serg@sergbook.mysql.com
549fe7c850
auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files
2006-05-06 07:43:18 -04:00
ingo@mysql.com
42e35c6be3
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10405
2006-05-06 13:35:48 +02:00
sergefp@mysql.com
cef2f703bf
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug16798
2006-05-06 13:48:20 +04:00
sergefp@mysql.com
8f8fa5838b
Merge mysql.com:/home/psergey/mysql-4.1-bug16798
...
into mysql.com:/home/psergey/mysql-5.0-bug16798-merge
2006-05-06 13:19:09 +04:00
sergefp@mysql.com
1b349cf85f
BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions
...
The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will
try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this
inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.
The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
constant).
TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().
2006-05-06 13:15:00 +04:00
ingo@mysql.com
83bd32079d
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-06 09:49:16 +02:00
kroki@mysql.com
3ad0cac41b
Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running)
...
after merge.
Concurrent read and update of privilege structures (like simultaneous
run of SHOW GRANTS and ADD USER) could result in server crash.
Ensure that proper locking of ACL structures is done.
No test case is provided because this bug can't be reproduced
deterministically.
2006-05-06 11:25:59 +04:00
kroki@mysql.com
0acef25de8
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-05-06 11:18:42 +04:00
kroki@mysql.com
8eb1dd26ad
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-real
2006-05-06 10:09:56 +04:00
tomas@poseidon.ndb.mysql.com
6a48847b1a
Bug #19492 --binlog-do-db option cuases tables create issues for ndb master
...
- ndb system tables not created because of filter, moved chack of filter
2006-05-06 01:25:44 +02:00
monty@mysql.com
9c132f3b6b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-05-05 20:09:20 +03:00
monty@mysql.com
8c7783c1e0
Don't use row level logging on optimize or repair table.
...
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
2006-05-05 20:08:40 +03:00
jmiller@mysql.com
9d1f5003c1
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-05 16:54:24 +02:00
tomas@poseidon.ndb.mysql.com
f8c37502b3
do not install ndb slave if no slaves
...
fixed memleak in ndbcluster_end
2006-05-05 15:34:46 +02:00
mskold@mysql.com
45d1965d31
Bug #18798 : mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started
2006-05-05 14:25:57 +02:00
jani@hundin.mysql.fi
96d4b9ebd1
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
2006-05-05 14:25:33 +03:00
monty@mysql.com
69d0960d60
Fixed wrong merge
2006-05-05 13:10:42 +03:00
jani@hundin.mysql.fi
b2c66756ab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
2006-05-05 12:46:15 +03:00
pekka@mysql.com
f717495693
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-work
2006-05-05 11:18:30 +02:00
monty@mysql.com
3ecf4de288
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/my/mysql-5.1
2006-05-05 11:38:05 +03:00
msvensson@shellback.(none)
15ec5dfeca
Import from yaSSL
2006-05-05 10:35:12 +02:00
msvensson@shellback.(none)
01faaacd25
Import from yaSSL
2006-05-05 10:33:04 +02:00
aelkin@mysql.com
8c57924a6a
Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
...
The reason of the bug is in that `get_var_with_binlog' performs missed
assingment of
the variables as side-effect. Doing that it eventually calls
`free_underlaid_joins' to pass as an argument `thd->lex->select_lex' of the lex
which belongs to the user query, not
to one which is emulated i.e SET @var1:=NULL.
`get_var_with_binlog' is refined to supply a temporary lex to sql_set_variables's stack.
2006-05-05 11:21:21 +03:00
kroki@mysql.com
d87e132379
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
2006-05-05 11:43:55 +04:00
ingo@mysql.com
9d9637ea51
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-05 09:42:20 +02:00
kroki@mysql.com
009cf0b75e
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
2006-05-05 11:35:49 +04:00
kroki@mysql.com
bc1b9eb04f
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-05-05 11:35:38 +04:00
monty@mysql.com
3e5d75c4e3
After merge fix
2006-05-05 04:52:32 +03:00
tomas@poseidon.ndb.mysql.com
135f4ab706
ndb: fix compile error
2006-05-05 00:59:27 +02:00
pekka@mysql.com
5ce418b260
ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char
2006-05-05 00:53:34 +02:00
tomas@poseidon.ndb.mysql.com
a9993f11ef
ndb: added missing ifdef
2006-05-05 00:33:12 +02:00
monty@mysql.com
047b9e318b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-05 01:12:02 +03:00
tomas@poseidon.ndb.mysql.com
f814a2184a
ndb disabled test case against verified bug
2006-05-05 00:06:44 +02:00
tomas@poseidon.ndb.mysql.com
831031ec02
disable test case since it causes failure in ndb_lock occationally, bug report referenced
2006-05-04 23:35:37 +02:00
jani@ua141d10.elisa.omakaista.fi
8b933cd63d
Added more comments to the test cases.
2006-05-05 00:27:12 +03:00
tomas@poseidon.ndb.mysql.com
44acdaac39
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 23:22:54 +02:00
jani@ua141d10.elisa.omakaista.fi
c8e5ade80c
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-05-05 00:22:01 +03:00
paul@polar.kitebird.com
61632812e2
.del-changelog-5.0.xml~f4c50926ccdd7434:
...
Delete: Docs/changelog-5.0.xml
2006-05-04 16:21:10 -05:00
paul@polar.kitebird.com
57ff78b5fe
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-05-04 16:18:34 -05:00
paul@polar.kitebird.com
a1e6218461
.del-changelog-4.1.xml~8aa496ebed09d868:
...
Delete: Docs/changelog-4.1.xml
2006-05-04 16:16:18 -05:00
paul@polar.kitebird.com
e67a5619f9
Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2006-05-04 16:15:31 -05:00
serg@sergbook.mysql.com
376117eb98
auto-include plug.in, remove the need for plugins to modify configure.in
2006-05-04 17:14:56 -04:00
paul@polar.kitebird.com
2842d28d14
.del-changelog-4.0.xml~8f56ee8a913e848b:
...
Delete: Docs/changelog-4.0.xml
2006-05-04 16:14:19 -05:00
monty@mysql.com
0034e1c829
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-04 23:49:59 +03:00
tomas@poseidon.ndb.mysql.com
f6ede396c0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00