Luis Soares f7202b84cb Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. ...

Revert BUG#34283.

Conflicts
=========
  Text conflict in sql/sql_load.cc
  1 conflicts encountered.

2010-07-30 14:49:57 +01:00

..

binlog

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

2010-07-30 14:49:57 +01:00

bugs

Bug #49741 test files contain explicit references to bin/relay-log positions

2010-05-24 21:54:08 +08:00

engines

Manual merge

2010-05-26 22:34:25 +08:00

federated

Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake

2010-06-14 11:23:49 +02:00

funcs_1

merge

2010-07-16 18:04:39 +03:00

funcs_2

…

ibmdb2i

Unset the execute bit where it's not needed.

2010-07-03 20:17:03 -03:00

innodb

Merge mysql-5.1 -> mysql-5.1-innodb

2010-07-23 12:51:14 +03:00

jp

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

large_tests

bug#50296

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

manual

Bug #49741 test files contain explicit references to bin/relay-log positions

2010-05-24 21:54:08 +08:00

ndb

Disabling failing NDB-tests due to Bug 54850 and Bug 54851.

2010-07-02 10:23:00 +04:00

ndb_team

Manual merge

2010-05-26 22:34:25 +08:00

parts

WL#5349 Change default storage engine to InnoDB

2010-06-17 22:51:35 +02:00

perfschema

Merge of mysql-trunk-merge into mysql-trunk-bugfixing.

2010-07-16 17:02:40 -03:00

perfschema_stress

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

rpl

Manual merge

2010-07-29 11:24:35 +08:00

rpl_ndb

merging for bug#54935 to trunk-bugfixing

2010-07-17 14:07:36 +03:00

stress

…

sys_vars

WL#5486: Remove code for unsupported platforms

2010-07-15 08:13:30 -03:00