mariadb/mysql-test/suite
Alfranio Correia 40949a3110 merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
  Text conflict in sql/log.cc
  Text conflict in sql/slave.cc
  Text conflict in sql/sql_base.cc
2010-01-13 12:22:34 +00:00
..
binlog Manual merge from next-mr. 2010-01-12 20:07:09 +08: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 Fixed more PB2 test failures introduced by backporting WL#2934. 2009-12-22 23:55:56 +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 WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
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 merge mysql-next-mr --> mysql-5.1-rpl-merge 2010-01-13 12:22:34 +00: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 next-mr. 2010-01-12 20:07:09 +08:00
rpl merge mysql-next-mr --> mysql-5.1-rpl-merge 2010-01-13 12:22:34 +00:00
rpl_ndb Manual merge from next-mr. 2010-01-12 20:07:09 +08:00
stress
sys_vars merge mysql-next-mr --> mysql-5.1-rpl-merge 2010-01-13 12:22:34 +00:00