diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2014-09-12 03:21:54 +0400 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2014-09-12 03:21:54 +0400 |
| commit | d2ae40ac2e9867fcf67ee3b3135de2905d463a12 (patch) | |
| tree | 6a2dbc46eaeb3f07fa4ac9ba736e5775a25dc1d7 /storage/innobase/mysql-test | |
| parent | c6051a4beb80505b4d6ce689204886c9fce61282 (diff) | |
| download | mariadb-git-d2ae40ac2e9867fcf67ee3b3135de2905d463a12.tar.gz | |
Fixes in storage_engine test suite
- after a change in 5.6.20, tests with big blobs require bigger
innodb_log_file_size value;
- innobase relay was running with the default InnoDB (XtraDB)
Diffstat (limited to 'storage/innobase/mysql-test')
6 files changed, 9 insertions, 2 deletions
diff --git a/storage/innobase/mysql-test/storage_engine/col_opt_not_null.opt b/storage/innobase/mysql-test/storage_engine/col_opt_not_null.opt new file mode 100644 index 00000000000..40445305fc6 --- /dev/null +++ b/storage/innobase/mysql-test/storage_engine/col_opt_not_null.opt @@ -0,0 +1 @@ +--innodb_log_file_size=100M diff --git a/storage/innobase/mysql-test/storage_engine/col_opt_null.opt b/storage/innobase/mysql-test/storage_engine/col_opt_null.opt new file mode 100644 index 00000000000..40445305fc6 --- /dev/null +++ b/storage/innobase/mysql-test/storage_engine/col_opt_null.opt @@ -0,0 +1 @@ +--innodb_log_file_size=100M diff --git a/storage/innobase/mysql-test/storage_engine/define_engine.inc b/storage/innobase/mysql-test/storage_engine/define_engine.inc index 7d7b0c7407a..77e384d2351 100644 --- a/storage/innobase/mysql-test/storage_engine/define_engine.inc +++ b/storage/innobase/mysql-test/storage_engine/define_engine.inc @@ -41,5 +41,9 @@ let $default_char_type = CHAR(8); # e.g. creation of an additional schema or table, etc. # The cleanup part should be defined in cleanup_engine.inc +CALL mtr.add_suppression("InnoDB: Resizing redo log from .* to .* pages, LSN=.*"); +CALL mtr.add_suppression("InnoDB: Starting to delete and rewrite log files."); +CALL mtr.add_suppression("InnoDB: New log files created, LSN=.*"); + --enable_query_log --enable_result_log diff --git a/storage/innobase/mysql-test/storage_engine/suite.opt b/storage/innobase/mysql-test/storage_engine/suite.opt index 66f581b56d0..034b58f2628 100644 --- a/storage/innobase/mysql-test/storage_engine/suite.opt +++ b/storage/innobase/mysql-test/storage_engine/suite.opt @@ -1,2 +1 @@ ---innodb - +--innodb --ignore-builtin-innodb --plugin-load=ha_innodb diff --git a/storage/innobase/mysql-test/storage_engine/type_blob.opt b/storage/innobase/mysql-test/storage_engine/type_blob.opt new file mode 100644 index 00000000000..40445305fc6 --- /dev/null +++ b/storage/innobase/mysql-test/storage_engine/type_blob.opt @@ -0,0 +1 @@ +--innodb_log_file_size=100M diff --git a/storage/innobase/mysql-test/storage_engine/type_text.opt b/storage/innobase/mysql-test/storage_engine/type_text.opt new file mode 100644 index 00000000000..40445305fc6 --- /dev/null +++ b/storage/innobase/mysql-test/storage_engine/type_text.opt @@ -0,0 +1 @@ +--innodb_log_file_size=100M |