Alexander Nozdrin 762b535de2 Manual merge from mysql-trunk. ...

Conflicts:
  - mysql-test/suite/engines/funcs/t/disabled.def
  - mysql-test/suite/engines/iuds/t/disabled.def
  - mysql-test/suite/engines/iuds/t/insert_number.test

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

..

archive

Manual merge from mysql-trunk.

2010-04-27 13:58:21 +04:00

blackhole

backport of patch for blckhole plugin (47748) to trunk-bugfixing.

2010-04-26 20:44:10 +02:00

csv

WL#5030: Split and remove mysql_priv.h

2010-04-01 14:19:08 +02:00

example

backport of cset for 47146 to trunk.

2010-04-26 18:23:20 +02:00

federated

Patch for 47759 to trunk-bugfixing.

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

heap

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

ibmdb2i

merge

2009-12-22 22:24:55 +01:00

innobase

Merging with mysql-trunk-bugfixing

2010-04-21 08:15:10 +02:00

myisam

Manual merge from mysql-trunk.

2010-04-27 13:58:21 +04:00

myisammrg

WL#5030: Split and remove mysql_priv.h

2010-03-31 16:05:33 +02:00

ndb

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

2010-03-24 18:03:44 +03:00

perfschema

Fix perfschema unittests build on Windows

2010-04-13 13:48:46 +02:00

Makefile.am

WL#5161 : Cross-platform build with CMake

2009-11-09 12:32:48 +01:00