0c4e5f784b Backport Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm ...

The 'rpl_cross_version' fails on mysql-next-mr-bugfixing as following:
mysqltest: In included file "./include/setup_fake_relay_log.inc": At line 80: query
'select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index'' failed:
1290: The MySQL server is running with the --secure-file-priv option so it cannot execute
this statement.

To fix the problem by removeing the --secure-file-priv option
for adapting the update of the 'setup_fake_relay_log.inc'.

2009-12-25 14:12:49 +08:00

..

binlog

Manual merge from mysql-trunk-merge.

2009-12-17 22:16:54 +03:00

bugs

Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY

2009-04-09 16:05:41 +03:00

federated

merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640

2009-11-06 18:35:04 +02:00

funcs_1

Auto-merge from mysql-next-mr-bugfixing.

2009-12-10 22:27:28 +03:00

funcs_2

merge 5.0-> 5.1

2009-04-24 13:00:17 -04:00

ibmdb2i

Bug#49329 example (and other) engines use wrong collation for open tables hash

2009-12-11 12:31:16 +05:30

innodb

Disable main.innodb and innodb.innodb-index until BUG#49396 is fixed.

2009-12-03 17:33:24 +05:30

jp

Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA)

2009-09-11 15:52:08 +03:00

large_tests

This is the downport of

2009-09-11 22:26:35 +02:00

manual

…

ndb

Manual merge from mysql-next-mr.

2009-11-02 14:10:04 +03:00

ndb_team

Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam

2009-05-31 13:44:41 +08:00

parts

Manual merge from mysql-trunk-merge.

2009-12-16 21:02:21 +03:00

rpl

Backport Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm

2009-12-25 14:12:49 +08:00

rpl_ndb

Manual resolving for the following files

2009-12-01 21:07:18 +02:00

stress

…

sys_vars

Backport of Bug#36785 to mysql-next-mr

2009-11-10 16:26:39 -02:00