Luis Soares 16a6158c47 merge: 5.1 -> 5.1-rpl-merge ...

conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test

2009-01-29 17:59:46 +01:00

..

binlog

merge: 5.1 -> 5.1-rpl

2009-01-23 13:22:05 +01:00

bugs

WL#4350 Options in my.cnf style config file should not start with --

2008-09-05 15:31:09 +02:00

federated

BUG#40143 federated.federated_server fails sporadically in pushbuild

2009-01-22 14:07:58 +01:00

funcs_1

Merge of fix for bug

2009-01-13 14:26:24 +01:00

funcs_2

Fix for Bug#40904 20 tests in 5.1 are disabled in a bad manner

2008-12-08 15:36:42 +01:00

im

Move instance manager tests to it's own suite

2007-08-29 19:02:33 +02:00

jp

Bug#36597 Testsuite "jp": Suspicious results for some tests using sjis

2008-07-29 10:43:57 +05:00

large_tests

Bug#27029 alter table ... enable keys crashes mysqld on large table

2007-06-21 12:45:56 -04:00

manual

manual merge for bug_29136, bug#29309.

2007-10-13 23:12:50 +03:00

ndb

merge: 5.1 -> 5.1-rpl

2009-01-23 13:22:05 +01:00

ndb_team

merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.

2008-11-12 19:51:47 +02:00

parts

merge: 5.1 -> 5.1-rpl

2009-01-23 13:22:05 +01:00

rpl

BUG#42370: rpl_trigger.test: Test case timeout after 900 seconds

2009-01-27 12:32:16 +01:00

rpl_ndb

merge: 5.1 -> 5.1-rpl

2009-01-23 13:22:05 +01:00

stress

Merge trift2.:/MySQL/M51/mysql-5.1

2008-02-22 16:14:27 +01:00

sys_vars

merge: 5.1 -> 5.1-rpl-merge

2009-01-29 17:59:46 +01:00