292929bc26
Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
...
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
bc5462fb44
Add extra INSERT to make usre sync_slave_with_master has job to do
2007-04-05 09:10:22 +02:00
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
10dffc5a19
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 12:26:01 +08:00
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
fdf57c7ac2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 10:47:40 +08:00
849e637127
fix test for bug#25721
...
did not run properly on a fast Windows machine
2007-04-04 21:35:58 +00:00
343bfb779d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-04 23:03:27 +02:00
fe6835c2b9
Fix a failure of this test case on HP-UX.
2007-04-05 00:04:44 +04:00
cedde5758d
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 21:56:10 +02:00
e9fd9a18e0
Bug #27638 : slow logging to CSV table inserts bad query_time and lock_time values
...
When MySQL logged slow query information to a CSV table, it stored the
query_time and lock_time values with an incorrect formula.
If the time was over 59 seconds, this caused incorrect statistics (either the
slow query was not logged, or the time was far from correct). This change
fixes the method used to store those TIME values in the slow_log table.
2007-04-04 21:40:47 +02:00
e40d3631a3
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-04 21:25:39 +03:00
552d1086ec
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-04 17:03:31 +02:00
6c8f5c5859
Merge from 5.0
2007-04-04 16:58:25 +02:00
18a259076d
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-04-04 17:37:36 +05:00
f8fb7a404b
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
...
additional fix(to satisfy Win where CreateFile func does not support the path longer than 260)
2007-04-04 17:36:58 +05:00
7e33b92279
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-04 13:21:49 +02:00
625a2629f0
Bug #26242 UPDATE with subquery and triggers failing with cluster tables
...
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).
The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.
This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
2007-04-04 12:50:39 +02:00
204559cd2c
Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 13:38:57 +03:00
b530ae54ee
BUG 27513: fixed left-over sql mode from a test case.
2007-04-04 13:38:19 +03:00
cba85dba20
Merge mysql.com:/home/hf/work/27359/my51-27359
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:20:00 +05:00
e44f0a2a2c
merging
2007-04-04 14:19:33 +05:00
ab15c0fb94
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
2007-04-04 11:06:48 +02:00
d7352bdd3e
Merge mysql.com:/home/hf/work/24633/my51-24633
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:05:45 +05:00
2117193783
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 11:05:22 +02:00
f65b42dc6e
Merge mysql.com:/home/hf/work/23675/my51-23675
...
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
2007-04-04 14:04:05 +05:00
f55ab9ef5e
Bug #23675 Partitions: possible security breach via alter
...
now we return different error message if user doesn't have
SELECT grants
2007-04-04 14:01:47 +05:00
41ac6776f5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
2007-04-04 11:52:53 +03:00
888fcd6f7e
recovery from 5.0 merge for bug18676
2007-04-04 15:22:37 +08:00
99895eb6c3
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-04 14:30:12 +08:00
38cf7dee4c
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 22:24:57 -07:00
0e14d4c7ed
Improved coverage for the code added to fix bug 27532.
2007-04-03 19:45:37 -07:00
a87e5ac3d5
Fix after manual merge
2007-04-03 17:09:41 -07:00
6aa599fc31
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-04-03 16:11:27 -07:00
90aa05d276
Fixed bug #27532 : wrong results with ORDER/GROUP BY queries containing
...
IN/BETWEEN predicates in sorting expressions.
Wrong results may occur when the select list contains an expression
with IN/BETWEEN predicate that differs from a sorting expression by
an additional NOT only.
Added the method Item_func_opt_neg::eq to compare correctly expressions
containing [NOT] IN/BETWEEN.
The eq method inherited from the Item_func returns TRUE when comparing
'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.
2007-04-03 14:32:16 -07:00
49d0b0caee
Fix a race that breaks the valgrind build.
2007-04-03 21:33:56 +04:00
49d2135c72
Bug#17095 Cluster RBR in circle does not terminate
...
- set correct server id
2007-04-03 17:36:05 +02:00
2179ee2b06
Bug #27513 : test case added to make sure this
...
crash bug doesn't reappear.
2007-04-03 18:00:57 +03:00
b436722bf1
Remove the cleanup of table t1 until problem with lock is fixed
2007-04-03 16:13:23 +02:00
6e7df50749
Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
...
- insert gap event on cluster connect
2007-04-03 14:49:57 +02:00
e4fde44948
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-03 14:51:32 +03:00
879725900b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-03 13:51:31 +02:00
3efa2df721
Replace not portable "--system rm" with --remove_file
2007-04-03 13:36:58 +02:00
2d47f0cb1b
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2007-04-03 16:13:27 +05:00
98e5757618
BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009.
2007-04-03 18:44:29 +08:00
93d0316f45
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
00905b20a4
Cleanup tables created by test cases
2007-04-03 11:36:33 +02:00
89dec159d1
Bug#27327 information_schema status views, variable_value conversion
...
Type of 'Slave_running' status variable is changed to bool
2007-04-03 14:24:35 +05:00
e6f629aff7
Merge mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.1-engines
2007-04-03 12:38:15 +05:00
ccbdbe5713
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
2007-04-03 12:11:51 +05:00
