From d2ae40ac2e9867fcf67ee3b3135de2905d463a12 Mon Sep 17 00:00:00 2001
From: Elena Stepanova <elenst@montyprogram.com>
Date: Fri, 12 Sep 2014 03:21:54 +0400
Subject: [PATCH] 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)
---
 .../innobase/mysql-test/storage_engine/col_opt_not_null.opt   | 1 +
 storage/innobase/mysql-test/storage_engine/col_opt_null.opt   | 1 +
 storage/innobase/mysql-test/storage_engine/define_engine.inc  | 4 ++++
 storage/innobase/mysql-test/storage_engine/suite.opt          | 3 +--
 storage/innobase/mysql-test/storage_engine/type_blob.opt      | 1 +
 storage/innobase/mysql-test/storage_engine/type_text.opt      | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 storage/innobase/mysql-test/storage_engine/col_opt_not_null.opt
 create mode 100644 storage/innobase/mysql-test/storage_engine/col_opt_null.opt
 create mode 100644 storage/innobase/mysql-test/storage_engine/type_blob.opt
 create mode 100644 storage/innobase/mysql-test/storage_engine/type_text.opt

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