Guilhem Bichot b0fcbc84ef merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +01:00

..

binlog

Bug #36763

2009-02-10 22:26:37 +01:00

bugs

merged 5.1-main -> 5.1-bugteam

2009-01-30 15:44:49 +02:00

federated

fixed system_mysql_db_fix30020 test faiilure

2009-02-02 13:36:03 +02:00

funcs_1

merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +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

…

jp

fixed jp test failures

2009-02-02 14:42:33 +04:00

large_tests

…

manual

manual merge for bug_29136, bug#29309.

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

maria

merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +01:00

ndb

merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +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 of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +01:00

rpl

merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

2009-03-11 16:32:42 +01:00

rpl_ndb

Bug #41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash

2009-02-04 12:13:54 +02:00

stress

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

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

sys_vars

merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.

2009-02-12 15:08:56 +01:00