mysql-5.5 merge

This commit is contained in:
Sergei Golubchik 2012-01-16 20:16:35 +01:00
commit 38e3ae155d
321 changed files with 5419 additions and 3982 deletions

View file

@ -4,8 +4,6 @@
#
# should work with embedded server after mysqltest is fixed
--source include/not_embedded.inc
--source federated.inc
--source have_federatedx.inc