after-merge fixes

This commit is contained in:
Sergei Golubchik 2014-10-15 22:42:08 +02:00
commit 42f359f982
14 changed files with 282 additions and 307 deletions

View file

@ -1 +1 @@
--ignore-builtin-innodb --loose-innodb --log-bin
--ignore-builtin-innodb --loose-innodb