diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-09 18:43:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-09 18:43:12 +0200 |
| commit | f171d3ff79bc44ebdb09cf0c9e0d38e9dc87155c (patch) | |
| tree | b0116c3cac0a411cfae9eca6f0ee7bf6ef144cec /mysql-test | |
| parent | 67002a58ce90e0728e35da3cf59252de880aa234 (diff) | |
| download | mariadb-git-f171d3ff79bc44ebdb09cf0c9e0d38e9dc87155c.tar.gz | |
commit_1innodb.test: update results from 5.6
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/commit.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index fdb9ef1f563..bdb6f48f095 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -7,7 +7,7 @@ ## set sql_mode=no_engine_substitution; -eval set storage_engine = $engine_type; +eval set default_storage_engine = $engine_type; set autocommit=1; --disable_warnings @@ -757,7 +757,7 @@ call p_verify_status_increment(2, 0, 4, 4); alter table t3 add column (b int); call p_verify_status_increment(2, 0, 2, 0); alter table t3 rename t4; -call p_verify_status_increment(2, 0, 2, 0); +call p_verify_status_increment(0, 0, 0, 0); rename table t4 to t3; call p_verify_status_increment(0, 0, 0, 0); truncate table t3; diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index af198edc4ca..3583e8ed396 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -1,6 +1,6 @@ call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); set sql_mode=no_engine_substitution; -set storage_engine = InnoDB; +set default_storage_engine = InnoDB; set autocommit=1; drop table if exists t1; drop table if exists t2; @@ -842,7 +842,7 @@ call p_verify_status_increment(2, 0, 2, 0); SUCCESS alter table t3 rename t4; -call p_verify_status_increment(2, 0, 2, 0); +call p_verify_status_increment(0, 0, 0, 0); SUCCESS rename table t4 to t3; |