Alexey Kopytov 017c969896 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. ...

Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_slow_query_log.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Conflict adding files to server-tools.  Created directory.
Conflict because server-tools is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to server-tools/instance-manager.  Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children.  Versioned directory.
Contents conflict in server-tools/instance-manager/options.cc
Text conflict in sql/mysqld.cc

2010-02-09 12:59:38 +05:00

..

binlog

Manual merge from mysql-5.1-bugteam.

2010-01-30 21:47:11 +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

Automerge from mysql-next-mr.

2009-10-27 12:57:44 +03:00

funcs_1

Manual merge from mysql-trunk-merge.

2009-11-06 17:20:27 +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

Auto-merge from mysql-5.1-bugteam.

2010-01-30 21:27:06 +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 of mysql-5.1-bugteam into mysql-trunk-merge.

2009-12-16 16:47:07 +03:00

rpl

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

2010-02-09 12:59:38 +05:00

rpl_ndb

Manual merge from mysql-5.1-bugteam.

2010-01-30 22:13:36 +03:00

stress

…

sys_vars

Merge from mysql-next-mr.

2009-10-28 10:55:44 +03:00