Alexander Nozdrin 31ba3bf5cb Manual merge from mysql-5.1-bugteam. ...

Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_sp.result

2010-02-03 17:01:48 +03:00

..

archive

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

2010-01-24 00:09:23 +03:00

blackhole

Manual merge from mysql-trunk-merge.

2009-11-05 23:28:35 +03:00

csv

Merge from mysql-next-mr.

2009-10-23 15:22:21 +04:00

example

Auto-merge from mysql-next-mr.

2009-11-05 15:08:37 +03:00

federated

Bug#47382 'mysqladmin debug' crash on 64-bit Windows

2009-11-10 13:41:43 -06:00

heap

Remove .cvsignore files (attempt #2).

2009-12-16 11:24:30 +03:00

ibmdb2i

Manual merge from mysql-trunk.

2009-12-22 09:31:24 +03:00

innobase

Applying InnoDB snapshot, fixes BUG#46193.

2010-01-22 13:57:02 +04:00

myisam

Postfix for Bug#37408 (fix for Bug#49898).

2009-12-24 10:10:05 +03:00

myisammrg

Manual merge from mysql-5.1-bugteam.

2010-02-03 17:01:48 +03:00

ndb

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

2010-01-24 00:09:23 +03:00

Makefile.am

Backport WL#3653 to 5.1 to enable bundled innodb plugin.

2009-06-10 10:59:49 +02:00

mysql_storage_engine.cmake

WL#4903 Plugin Service API part I

2009-11-02 21:05:42 +01:00