diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-01 13:06:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-01 13:06:14 +0300 |
| commit | e0e374783ad5f265b8cf24e0283ecf67c663ba89 (patch) | |
| tree | 2f346e701bec401d0624c8c73ea504d92dc77842 | |
| parent | 743814f763725fc9ef3c13b4626d7765d3e29f78 (diff) | |
| download | mariadb-git-e0e374783ad5f265b8cf24e0283ecf67c663ba89.tar.gz | |
MDEV-9865: Test encryption.innodb-log-encrypt-crash takes too long on debug build
Add big_test and not_debug requirements to avoid timeouts.
| -rw-r--r-- | mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test | 3 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test b/mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test index 8bb5f9f2c49..cb9a69d036b 100644 --- a/mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test +++ b/mysql-test/suite/encryption/t/innodb-log-encrypt-crash.test @@ -1,5 +1,8 @@ -- source include/have_innodb.inc -- source include/not_embedded.inc +# test takes very long time on debug build +-- source include/not_debug.inc +-- source include/big_test.inc -- source filekeys_plugin.inc call mtr.add_suppression("InnoDB: New log files created, LSN=.*"); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 04c573f8426..a60462bc9d6 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -13535,14 +13535,15 @@ ha_innobase::info_low( break; } - DBUG_EXECUTE_IF("ib_ha_innodb_stat_not_initialized", + DBUG_EXECUTE_IF("ib_ha_innodb_stat_not_initialized", index->table->stat_initialized = FALSE;); if (!ib_table->stat_initialized || (index->table != ib_table || !index->table->stat_initialized)) { fprintf(stderr, - "InnoDB: Warning: Index %s points to table %s" " and ib_table %s statistics is initialized %d " + "InnoDB: Warning: Index %s points to table %s" + " and ib_table %s statistics is initialized %d " " but index table %s initialized %d " " mysql table is %s. Have you mixed " "up .frm files from different " |