Automerge with 5.1

2025-07-29 05:21:33 +03:00 · 2010-08-25 01:44:50 +03:00
parent 99b79db5dc a826711789
commit 58a75bb18b
167 changed files with 1625 additions and 925 deletions
--- a/mysql-test/suite/pbxt/my.cnf
+++ b/mysql-test/suite/pbxt/my.cnf
@ -2,6 +2,7 @@
 !include include/default_mysqld.cnf

 [mysqld.1]
+pbxt
 default-storage-engine=pbxt

 [ENV]
--- a/mysql-test/suite/pbxt/t/suite.opt
+++ b/mysql-test/suite/pbxt/t/suite.opt
@ -1 +0,0 @@
--default-storage-engine=pbxt