diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:10:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:10:31 +0200 |
| commit | 115a2967563d3ac734ce371260098710ba42cdf0 (patch) | |
| tree | 65e47f4073a43efaf233b2953660aad6b18a107f /mysql-test | |
| parent | cefc30b1663114930439e03dec245604bc904604 (diff) | |
| download | mariadb-git-115a2967563d3ac734ce371260098710ba42cdf0.tar.gz | |
merge with XtraDB as of Percona-Server-5.1.63-rel13.4
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/innodb/t/disabled.def | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/disabled.def | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def index 1d25fbf14c0..6795892ecae 100644 --- a/mysql-test/suite/innodb/t/disabled.def +++ b/mysql-test/suite/innodb/t/disabled.def @@ -10,10 +10,5 @@ # ############################################################################## -innodb_bug13635833: Disabled until merging with XtraDB 5.1.63 - -innodb-lock: Disabled until merging with XtraDB 5.1.60 -innodb_replace: Disabled until merging with XtraDB 5.1.60 - innodb_bug14007649: Disabled until merging with XtraDB 5.1.65 diff --git a/mysql-test/suite/innodb_plugin/t/disabled.def b/mysql-test/suite/innodb_plugin/t/disabled.def index a849d589fb2..d692eccac74 100644 --- a/mysql-test/suite/innodb_plugin/t/disabled.def +++ b/mysql-test/suite/innodb_plugin/t/disabled.def @@ -10,11 +10,5 @@ # ############################################################################## -innodb_bug13635833: Disabled until merging with XtraDB 5.1.63 - innodb_bug52745: Disabled as this has valgrind failures (also in MySQL 5.1.50) -innodb-index: Disabled until merging with XtraDB 5.1.60 -innodb-lock: Disabled until merging with XtraDB 5.1.60 -innodb_replace: Disabled until merging with XtraDB 5.1.60 -innodb-blob: Disabled until merging with XtraDB 5.1.63 innodb_bug14007649: Disabled until merging with XtraDB 5.1.65 |