diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /mysql-test/suite/innodb | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug13510739.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb.test | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug13510739.result b/mysql-test/suite/innodb/r/innodb_bug13510739.result index 8aa4323eeb0..e1e6e27239c 100644 --- a/mysql-test/suite/innodb/r/innodb_bug13510739.result +++ b/mysql-test/suite/innodb/r/innodb_bug13510739.result @@ -6,5 +6,5 @@ HANDLER bug13510739 READ `primary` = (2); c HANDLER bug13510739 READ `primary` NEXT; c -4 +3 DROP TABLE bug13510739; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index d57a52a2362..4d7dbdbd6a6 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1,9 +1,3 @@ ---source include/not_windows_embedded.inc -# remove this when -# Bug#53947 InnoDB: Assertion failure in thread 4224 in file -# .\sync\sync0sync.c line 324 -# is fixed - ####################################################################### # # # Please, DO NOT TOUCH this file as well as the innodb.result file. # |