Alexey Kopytov e118ec409f Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. ...

Conflicts:

Text conflict in sql/sql_base.cc
Text conflict in sql/sql_partition.cc
Text conflict in sql/sql_priv.h
Text conflict in sql/sql_show.cc

2010-05-11 20:02:50 +04:00

..

binlog

Manual merge from mysql-trunk.

2010-05-07 13:37:16 +04:00

bugs

…

engines

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

2010-05-09 02:03:35 +04:00

federated

Patch for 47759 to trunk-bugfixing.

2010-05-05 09:35:38 +02:00

funcs_1

Streamlined funcs_1.storedproc broken by the patch for bug #8433.

2010-03-20 21:34:51 +03:00

funcs_2

…

ibmdb2i

…

innodb

Disable innodb.innodb, main.ps_3innodb and main.partition_innodb_plugin

2010-04-30 13:02:36 +03:00

jp

…

large_tests

bug#50296

2010-02-28 19:39:28 +02:00

manual

…

ndb

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

ndb_team

…

parts

Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.

2010-05-11 20:02:50 +04:00

perfschema

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

perfschema_stress

…

rpl

Manual merge of local mysql-trunk-merge with bk-internal.

2010-05-07 18:56:46 +04:00

rpl_ndb

BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed mode

2010-05-09 23:45:25 +01:00

stress

…

sys_vars

Manual merge of local mysql-trunk-merge with bk-internal.

2010-05-07 18:56:46 +04:00