diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
commit | e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2 (patch) | |
tree | ba4f3d737607d1a87e68b4e48e1f41119bee3b82 /mysql-test/suite/innodb/t/innodb_bug56947.test | |
parent | b427da7651f348550deb886024c0d3101720f00e (diff) | |
download | mariadb-git-e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2.tar.gz |
Fixes for innodb suite, merging tests from 5.6.
Includes 5.6 changesets for:
*****
Fix for BUG#13489996 valgrind:conditional jump or move depends on uninitialised values-field_blob.
blob_ptr_size was not initialized properly: remove this variable.
*****
Bug#14021323 CRASH IN FIELD::SET_NULL WHEN INSERTING ROWS TO NEW TABLE
*****
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb_bug56947.test')
-rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug56947.test | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug56947.test b/mysql-test/suite/innodb/t/innodb_bug56947.test index b6feb239314..4cefeb391cf 100644 --- a/mysql-test/suite/innodb/t/innodb_bug56947.test +++ b/mysql-test/suite/innodb/t/innodb_bug56947.test @@ -1,15 +1,17 @@ ---source include/have_innodb.inc # # Bug #56947 valgrind reports a memory leak in innodb-plugin.innodb-index # -SET @old_innodb_file_per_table=@@innodb_file_per_table; -# avoid a message about filed *.ibd file creation in the error log +-- source include/have_innodb.inc +-- source include/have_debug.inc + SET GLOBAL innodb_file_per_table=0; create table bug56947(a int not null) engine = innodb; -CREATE TABLE `bug56947#1`(a int) ENGINE=InnoDB; ---error 156 + +SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename'; +--error ER_GET_ERRNO alter table bug56947 add unique index (a); -drop table `bug56947#1`; +SET DEBUG_DBUG='-d,ib_rebuild_cannot_rename'; +check table bug56947; + drop table bug56947; ---disable_query_log -SET GLOBAL innodb_file_per_table=@old_innodb_file_per_table; +SET @@global.innodb_file_per_table=DEFAULT; |