deleted wl6501/(they are relevant only from 10.2.2)mdev-13625

24 files changed, 0 insertions, 7523 deletions

diff --git a/mysql-test/suite/innodb/include/innodb_wl6501_crash.inc b/mysql-test/suite/innodb/include/innodb_wl6501_crash.inc
deleted file mode 100644
index 1d7a3510b44..00000000000
--- a/mysql-test/suite/innodb/include/innodb_wl6501_crash.inc
+++ /dev/null
@@ -1,416 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-# suppress expected warnings.
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-
-################################################################################
-#
-# Will test following scenarios:
-# 1. Hit crash point while writing redo log.
-# 2. Hit crash point on completion of redo log write.
-# 3. Hit crash point while dropping indexes.
-# 4. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-# 5. Hit crash point while creating indexes.
-# 6. Hit crash point after data is updated to system-table and in-memory dict.
-# 7. Hit crash point before/after log checkpoint is done.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Hit crash point while writing redo log.
-#
---echo "1. Hit crash point while writing redo log."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_while_writing_redo_log";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Hit crash point on completion of redo log write.
-#
---echo "2. Hit crash point on completion of redo log write."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_after_redo_log_write_complete";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 3. Hit crash point while dropping indexes.
-#
---echo "3. Hit crash point while dropping indexes."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_clust_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_uniq_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-#
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_sec_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 4. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-#
---echo "4. Hit crash point on completing drop of all indexes before creation"
---echo "   of index is commenced."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 5. Hit crash point while creating indexes.
-#
---echo "5. Hit crash point while creating indexes."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_clust_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_uniq_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_sec_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 6. Hit crash point after data is updated to system-table and in-memory dict.
-#
---echo "6. Hit crash point after data is updated to system-table and"
---echo "   in-memory dict."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 7. Hit crash point before/after log checkpoint is done.
-#
---echo "7. Hit crash point before/after log checkpoint is done."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_before_log_removal";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_after_truncate_done";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb/include/innodb_wl6501_crash_temp.inc b/mysql-test/suite/innodb/include/innodb_wl6501_crash_temp.inc
deleted file mode 100644
index da95c7b3562..00000000000
--- a/mysql-test/suite/innodb/include/innodb_wl6501_crash_temp.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-# suppress expected warnings
-call mtr.add_suppression("does not exist in the InnoDB internal");
-
-################################################################################
-#
-# Will test following scenarios:
-# 1. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-# 2. Hit crash point after data is updated to system-table and in-memory dict.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-#
---echo "1. Hit crash point on completing drop of all indexes before creation"
---echo "   of index is commenced."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-set innodb_strict_mode=off;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Hit crash point after data is updated to system-table and in-memory dict.
-#
---echo "2. Hit crash point after data is updated to system-table and"
---echo "   in-memory dict."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-set innodb_strict_mode=off;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash.inc
deleted file mode 100644
index fedd32d4849..00000000000
--- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash.inc
+++ /dev/null
@@ -1,418 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-# suppress expected warnings.
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-
-################################################################################
-#
-# Will test following scenarios:
-# 1. Hit crash point while writing redo log.
-# 2. Hit crash point on completion of redo log write.
-# 3. Hit crash point while dropping indexes.
-# 4. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-# 5. Hit crash point while creating indexes.
-# 6. Hit crash point after data is updated to system-table and in-memory dict.
-# 7. Hit crash point before/after log checkpoint is done.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-SET GLOBAL innodb_file_format=Barracuda;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Hit crash point while writing redo log.
-#
---echo "1. Hit crash point while writing redo log."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_while_writing_redo_log";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Hit crash point on completion of redo log write.
-#
---echo "2. Hit crash point on completion of redo log write."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
-SET GLOBAL innodb_file_format=Barracuda;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_after_redo_log_write_complete";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 3. Hit crash point while dropping indexes.
-#
---echo "3. Hit crash point while dropping indexes."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_clust_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_uniq_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-#
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_drop_of_sec_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 4. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-#
---echo "4. Hit crash point on completing drop of all indexes before creation"
---echo "   of index is commenced."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 5. Hit crash point while creating indexes.
-#
---echo "5. Hit crash point while creating indexes."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_clust_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_uniq_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_create_of_sec_index";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 6. Hit crash point after data is updated to system-table and in-memory dict.
-#
---echo "6. Hit crash point after data is updated to system-table and"
---echo "   in-memory dict."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 7. Hit crash point before/after log checkpoint is done.
-#
---echo "7. Hit crash point before/after log checkpoint is done."
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_before_log_removal";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t where f < 2.5;
-drop table t;
-#
-#
-use test;
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-SET innodb_strict_mode=OFF;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_after_truncate_done";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-select * from t;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-select * from t where f < 2.5;
-drop table t;
-
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash_temp.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash_temp.inc
deleted file mode 100644
index da95c7b3562..00000000000
--- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_crash_temp.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-# suppress expected warnings
-call mtr.add_suppression("does not exist in the InnoDB internal");
-
-################################################################################
-#
-# Will test following scenarios:
-# 1. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-# 2. Hit crash point after data is updated to system-table and in-memory dict.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-let SEARCH_FILE = $MYSQLTEST_VARDIR/log/my_restart.err;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Hit crash point on completing drop of all indexes before creation of index
-#    is commenced.
-#
---echo "1. Hit crash point on completing drop of all indexes before creation"
---echo "   of index is commenced."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-set innodb_strict_mode=off;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Hit crash point after data is updated to system-table and in-memory dict.
-#
---echo "2. Hit crash point after data is updated to system-table and"
---echo "   in-memory dict."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
-set innodb_strict_mode=off;
---disable_warnings
-eval create $wl6501_temp table t (
-	i int, f float, c char,
-	primary key pk(i), unique findex(f), index ck(c))
-	engine = innodb row_format = $wl6501_row_fmt
-	key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-check table t;
-#
-set session debug_dbug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
---source include/expect_crash.inc
---error 2013
-truncate table t;
-#
---source include/start_mysqld.inc
-check table t;
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc
deleted file mode 100644
index 424608f251b..00000000000
--- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
---source include/have_innodb.inc
---source include/have_debug.inc
-
---disable_query_log
-# suppress expected warnings
-call mtr.add_suppression("Unable to truncate FTS index for table");
-call mtr.add_suppression("Unable to assign a new identifier to table "
-			 "`.*`\.`.*` after truncating it");
-call mtr.add_suppression("Flagged corruption of .* in table "
-			 "`.*`\.`.*` in TRUNCATE TABLE");
-call mtr.add_suppression("Parent table of FTS auxiliary table "
-			 ".*\/.* not found");
---enable_query_log
-################################################################################
-#
-# Will test following scenarios:
-# 1. Error in assigning undo logs for truncate action.
-# 2. Error while preparing for truncate.
-# 3. Error while dropping/creating indexes.
-# 4. Error while completing truncate of table involving FTS.
-# 5. Error while updating sys-tables.
-#
-################################################################################
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-let $format = `select @@innodb_file_format`;
-
-eval set global innodb_file_per_table = on;
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-set innodb_strict_mode=off;
-
-#-----------------------------------------------------------------------------
-#
-# 1. Error in assigning undo logs for truncate action.
-#
---echo "1. Error in assigning undo logs for truncate action."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-#
-#check table t;
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 2. Error while preparing for truncate.
-#
---echo "2. Error while preparing for truncate."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-#
-#check table t;
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 3. Error while dropping/creating indexes
-#
---echo "3. Error while dropping/creating indexes"
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_drop_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_drop_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-#
-#
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_create_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_create_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-#
-#
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create temporary table t (
-        i int, f float, c char,
-        primary key pk(i), unique findex(f), index ck(c))
-        engine = innodb row_format = $wl6501_row_fmt
-        key_block_size = $wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 4. Error while completing truncate of table involving FTS.
-#
---echo "4. Error while completing truncate of table involving FTS."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (i int, f float, c char(100),
-	primary key pk(i), index fk(f), fulltext index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-		     (2, 2.2, 'innodb is part of mysql'),
-		     (3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# 5. Error while updating sys-tables.
-#
---echo "5. Error while updating sys-tables."
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---disable_warnings
-eval create $wl6501_temp table t (i int, f float, c char(100),
-	primary key pk(i), index fk(f), fulltext index ck(c))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
---enable_warnings
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-		     (2, 2.2, 'innodb is part of mysql'),
-		     (3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-#check table t;
-#
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
---error ER_GET_ERRNO
-truncate table t;
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-#
-#check table t;
---error ER_TABLE_CORRUPT, 1030
-select * from t order by i;
-drop table t;
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc
deleted file mode 100644
index bef28a9c484..00000000000
--- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# load tables with some significant amount of data and then truncate it.
-#
-
-#-----------------------------------------------------------------------------
-#
-# create test-bed
-#
-let $per_table = `select @@innodb_file_per_table`;
-let $format = `select @@innodb_file_format`;
-
-let $WL6501_TMP_DIR = `select @@tmpdir`;
-let $WL6501_DATA_DIR = `select @@datadir`;
-set innodb_strict_mode=OFF;
-
-#-----------------------------------------------------------------------------
-#
-# create procedure to load data
-#
-delimiter |;
-create procedure populate()
-begin
-	declare i int default 1;
-	while (i <= 5000) do
-		insert into t1 values (i, 'a', 'b');
-		insert into t2 values (i, 'a', 'b');
-		insert into t3 values (i, 'a', 'b');
-		set i = i + 1;
-	end while;
-end|
-create procedure populate_small()
-begin
-	declare i int default 10001;
-	while (i <= 12000) do
-		insert into t1 values (i, 'c', 'd');
-		insert into t2 values (i, 'a', 'b');
-		insert into t3 values (i, 'a', 'b');
-		set i = i + 1;
-	end while;
-end|
-delimiter ;|
-
-#-----------------------------------------------------------------------------
-#
-# create and load the tables.
-#
-eval set global innodb_file_per_table = $wl6501_file_per_table;
---replace_regex /[0-9]+/NUMBER/
-eval create table t1
-	(i int, c1 char(100), c2 char(100),
-	 index c1_idx(c1))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
-eval create table t2
-	(i int, c1 char(100), c2 char(100),
-	 index c1_idx(c1))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
-eval create temporary table t3
-	(i int, c1 char(100), c2 char(100),
-	 index c1_idx(c1))
-	engine=innodb row_format=$wl6501_row_fmt
-	key_block_size=$wl6501_kbs;
-#
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-begin;
-call populate();
-commit;
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-#
-truncate table t1;
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-#
-call populate_small();
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-#
-truncate table t2;
-truncate table t3;
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-#
-call populate_small();
-select count(*) from t1;
-select count(*) from t2;
-select count(*) from t3;
-#
-drop table t1;
-drop table t2;
-drop table t3;
-
-#-----------------------------------------------------------------------------
-#
-# drop the procedure
-#
-drop procedure populate;
-drop procedure populate_small;
-
-#-----------------------------------------------------------------------------
-#
-# remove test-bed
-#
-eval set global innodb_file_format = $format;
-eval set global innodb_file_per_table = $per_table;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501.result b/mysql-test/suite/innodb_zip/r/wl6501.result
deleted file mode 100644
index e1b755521e1..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501.result
+++ /dev/null
@@ -1,1334 +0,0 @@
-"1. Test some basic dml action involving truncate of table."
-use test;
-set global innodb_file_per_table = 0;
-create table t1
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create table t2
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) do
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small()
-begin
-declare i int default 1;
-while (i <= 20) do
-insert into t1 values (i, 'c', 'd');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small2()
-begin
-declare i int default 30;
-while (i <= 50) do
-insert into t1 values (i, 'e', 'f');
-set i = i + 1;
-end while;
-end|
-begin;
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-select * from t1 limit 10;
-keyc	c1	c2
-1	a	b
-2	a	b
-3	a	b
-4	a	b
-5	a	b
-6	a	b
-7	a	b
-8	a	b
-9	a	b
-10	a	b
-rollback;
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-commit;
-select count(*) from t1;
-count(*)
-200
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-20
-rollback;
-select count(*) from t1;
-count(*)
-20
-truncate table t1;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-delete from t1 where keyc <= 60;
-select count(*) from t1;
-count(*)
-140
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-160
-select * from t1 limit 10;
-keyc	c1	c2
-1	c	d
-2	c	d
-3	c	d
-4	c	d
-5	c	d
-6	c	d
-7	c	d
-8	c	d
-9	c	d
-10	c	d
-begin;
-call populate_t1_small2();
-select count(*) from t1;
-count(*)
-181
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-31	e	f
-32	e	f
-33	e	f
-34	e	f
-35	e	f
-36	e	f
-37	e	f
-38	e	f
-39	e	f
-40	e	f
-rollback;
-select count(*) from t1;
-count(*)
-160
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-61	a	b
-62	a	b
-63	a	b
-64	a	b
-65	a	b
-66	a	b
-67	a	b
-68	a	b
-69	a	b
-70	a	b
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-rollback;
-begin;
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-4001	c	d
-4002	c	d
-4003	c	d
-4004	c	d
-4005	c	d
-4006	c	d
-4007	c	d
-4008	c	d
-4009	c	d
-4010	c	d
-rollback;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-commit;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-insert into t2 select * from t1 where keyc < 2101;
-select count(*) from t2;
-count(*)
-60
-drop procedure populate_t1;
-drop procedure populate_t1_small;
-drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-create temporary table t1
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create temporary table t2
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) do
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small()
-begin
-declare i int default 1;
-while (i <= 20) do
-insert into t1 values (i, 'c', 'd');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small2()
-begin
-declare i int default 30;
-while (i <= 50) do
-insert into t1 values (i, 'e', 'f');
-set i = i + 1;
-end while;
-end|
-begin;
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-select * from t1 limit 10;
-keyc	c1	c2
-1	a	b
-2	a	b
-3	a	b
-4	a	b
-5	a	b
-6	a	b
-7	a	b
-8	a	b
-9	a	b
-10	a	b
-rollback;
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-commit;
-select count(*) from t1;
-count(*)
-200
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-20
-rollback;
-select count(*) from t1;
-count(*)
-20
-truncate table t1;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-delete from t1 where keyc <= 60;
-select count(*) from t1;
-count(*)
-140
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-160
-select * from t1 limit 10;
-keyc	c1	c2
-1	c	d
-2	c	d
-3	c	d
-4	c	d
-5	c	d
-6	c	d
-7	c	d
-8	c	d
-9	c	d
-10	c	d
-begin;
-call populate_t1_small2();
-select count(*) from t1;
-count(*)
-181
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-31	e	f
-32	e	f
-33	e	f
-34	e	f
-35	e	f
-36	e	f
-37	e	f
-38	e	f
-39	e	f
-40	e	f
-rollback;
-select count(*) from t1;
-count(*)
-160
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-61	a	b
-62	a	b
-63	a	b
-64	a	b
-65	a	b
-66	a	b
-67	a	b
-68	a	b
-69	a	b
-70	a	b
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-rollback;
-begin;
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-4001	c	d
-4002	c	d
-4003	c	d
-4004	c	d
-4005	c	d
-4006	c	d
-4007	c	d
-4008	c	d
-4009	c	d
-4010	c	d
-rollback;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-commit;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-insert into t2 select * from t1 where keyc < 2101;
-select count(*) from t2;
-count(*)
-60
-drop procedure populate_t1;
-drop procedure populate_t1_small;
-drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-set global innodb_file_per_table = 1;
-create table t1
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create table t2
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) do
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small()
-begin
-declare i int default 1;
-while (i <= 20) do
-insert into t1 values (i, 'c', 'd');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small2()
-begin
-declare i int default 30;
-while (i <= 50) do
-insert into t1 values (i, 'e', 'f');
-set i = i + 1;
-end while;
-end|
-begin;
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-select * from t1 limit 10;
-keyc	c1	c2
-1	a	b
-2	a	b
-3	a	b
-4	a	b
-5	a	b
-6	a	b
-7	a	b
-8	a	b
-9	a	b
-10	a	b
-rollback;
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-commit;
-select count(*) from t1;
-count(*)
-200
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-20
-rollback;
-select count(*) from t1;
-count(*)
-20
-truncate table t1;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-delete from t1 where keyc <= 60;
-select count(*) from t1;
-count(*)
-140
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-160
-select * from t1 limit 10;
-keyc	c1	c2
-1	c	d
-2	c	d
-3	c	d
-4	c	d
-5	c	d
-6	c	d
-7	c	d
-8	c	d
-9	c	d
-10	c	d
-begin;
-call populate_t1_small2();
-select count(*) from t1;
-count(*)
-181
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-31	e	f
-32	e	f
-33	e	f
-34	e	f
-35	e	f
-36	e	f
-37	e	f
-38	e	f
-39	e	f
-40	e	f
-rollback;
-select count(*) from t1;
-count(*)
-160
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-61	a	b
-62	a	b
-63	a	b
-64	a	b
-65	a	b
-66	a	b
-67	a	b
-68	a	b
-69	a	b
-70	a	b
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-rollback;
-begin;
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-4001	c	d
-4002	c	d
-4003	c	d
-4004	c	d
-4005	c	d
-4006	c	d
-4007	c	d
-4008	c	d
-4009	c	d
-4010	c	d
-rollback;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-commit;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-insert into t2 select * from t1 where keyc < 2101;
-select count(*) from t2;
-count(*)
-60
-drop procedure populate_t1;
-drop procedure populate_t1_small;
-drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-create temporary table t1
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create temporary table t2
-(keyc int, c1 char(100), c2 char(100),
-primary key(keyc), index sec_index(c1)
-) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) do
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small()
-begin
-declare i int default 1;
-while (i <= 20) do
-insert into t1 values (i, 'c', 'd');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t1_small2()
-begin
-declare i int default 30;
-while (i <= 50) do
-insert into t1 values (i, 'e', 'f');
-set i = i + 1;
-end while;
-end|
-begin;
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-select * from t1 limit 10;
-keyc	c1	c2
-1	a	b
-2	a	b
-3	a	b
-4	a	b
-5	a	b
-6	a	b
-7	a	b
-8	a	b
-9	a	b
-10	a	b
-rollback;
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-commit;
-select count(*) from t1;
-count(*)
-200
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-20
-rollback;
-select count(*) from t1;
-count(*)
-20
-truncate table t1;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-delete from t1 where keyc <= 60;
-select count(*) from t1;
-count(*)
-140
-call populate_t1_small();
-select count(*) from t1;
-count(*)
-160
-select * from t1 limit 10;
-keyc	c1	c2
-1	c	d
-2	c	d
-3	c	d
-4	c	d
-5	c	d
-6	c	d
-7	c	d
-8	c	d
-9	c	d
-10	c	d
-begin;
-call populate_t1_small2();
-select count(*) from t1;
-count(*)
-181
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-31	e	f
-32	e	f
-33	e	f
-34	e	f
-35	e	f
-36	e	f
-37	e	f
-38	e	f
-39	e	f
-40	e	f
-rollback;
-select count(*) from t1;
-count(*)
-160
-select * from t1 where keyc > 30 limit 10;
-keyc	c1	c2
-61	a	b
-62	a	b
-63	a	b
-64	a	b
-65	a	b
-66	a	b
-67	a	b
-68	a	b
-69	a	b
-70	a	b
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-rollback;
-begin;
-update t1 set keyc = keyc + 2000;
-select * from t1 limit 10;
-keyc	c1	c2
-4001	c	d
-4002	c	d
-4003	c	d
-4004	c	d
-4005	c	d
-4006	c	d
-4007	c	d
-4008	c	d
-4009	c	d
-4010	c	d
-rollback;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-commit;
-select * from t1 limit 10;
-keyc	c1	c2
-2001	c	d
-2002	c	d
-2003	c	d
-2004	c	d
-2005	c	d
-2006	c	d
-2007	c	d
-2008	c	d
-2009	c	d
-2010	c	d
-insert into t2 select * from t1 where keyc < 2101;
-select count(*) from t2;
-count(*)
-60
-drop procedure populate_t1;
-drop procedure populate_t1_small;
-drop procedure populate_t1_small2;
-drop table t1;
-drop table t2;
-"2. Test that truncating reference table is blocked."
-use test;
-create table master
-(i int, f float, c char(100),
-primary key pk(i), index fidx(f))
-engine = innodb;
-create table slave
-(i int, j int,
-primary key pk(i),
-foreign key fk(j) references master(i))
-engine = innodb;
-insert into master values
-(1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c'),
-(4, 4.4, 'd'), (5, 5.5, 'e');
-insert into slave values
-(101, 1), (202, 3), (303, 5);
-select * from master;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-4	4.4	d
-5	5.5	e
-select * from slave;
-i	j
-101	1
-202	3
-303	5
-truncate table master;
-ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`test`.`slave`, CONSTRAINT `slave_ibfk_1` FOREIGN KEY (`j`) REFERENCES `test`.`master` (`i`))
-drop table slave;
-drop table master;
-"3. Test truncate of loaded table that has blob + compression."
-use test;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) DO
-insert into t1 values (i, i, repeat(concat('tc3_', i), 1000),
-repeat('a', 1000));
-set i = i + 1;
-end while;
-end|
-set global innodb_file_per_table = 0;
-create table t1 (a int not null, d int not null, b blob not null, c text,
-primary key (b(10), a, d),  index (d), index(a),  index (c(355),
-b(255)), index (b(5), c(10), a)
-) engine=InnoDB;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-drop table t1;
-set innodb_strict_mode=off;
-create table t1 (a int not null, d int not null, b blob not null, c text,
-primary key (b(10), a, d),  index (d), index(a),  index (c(355),
-b(255)), index (b(5), c(10), a)
-) engine=InnoDB row_format=compressed key_block_size=8;
-set innodb_strict_mode=default;
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select count(*) from t1;
-count(*)
-0
-call populate_t1();
-select count(*) from t1;
-count(*)
-200
-drop table t1;
-drop procedure populate_t1;
-use test;
-SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 200) DO
-insert into t1 values (i, i, repeat(concat('tc3_', i), 150),
-repeat('a', 100));
-set i = i + 1;
-end while;
-end|
-set global innodb_file_per_table = 1;
-create table t1 (a int not null, d int not null, b varchar(198) not null,
-c char(185), unique key (b(10), a, d), index (d), index(a),
-index (c(120), b(120)), index (b(5), c(10), a))
-engine=InnoDB stats_persistent=0 row_format=compressed key_block_size=1;
-begin;
-call populate_t1();
-commit;
-select count(*) from t1;
-count(*)
-200
-SET sql_mode = default;
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-commit;
-select count(*) from t1;
-count(*)
-200
-drop table t1;
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create table t1 (a int not null, d int not null, b varchar(198) not null,
-c char(185), unique key (b(10), a, d), index (d), index(a),
-index (c(120), b(120)), index (b(5), c(10), a))
-engine=InnoDB stats_persistent=0;
-begin;
-call populate_t1();
-commit;
-select count(*) from t1;
-count(*)
-200
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select count(*) from t1;
-count(*)
-0
-begin;
-call populate_t1();
-commit;
-select count(*) from t1;
-count(*)
-200
-drop table t1;
-drop procedure populate_t1;
-"5 check truncate with lock/unlock"
-use test;
-set global innodb_file_per_table = 1;
-create table master
-(i int, f float, c char(100),
-primary key pk(i), index fidx(f))
-engine = innodb;
-insert into master values
-(1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c'),
-(4, 4.4, 'd'), (5, 5.5, 'e');
-select * from master;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-4	4.4	d
-5	5.5	e
-"--In con1 connection--"
-use test;
-lock tables master write;
-"--In default connection--"
-use test;
-truncate table master;;
-"--In con1 connection--"
-select * from master;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-4	4.4	d
-5	5.5	e
-unlock tables;
-"--In default connection--"
-select * from master;
-i	f	c
-drop table master;
-use test;
-set global innodb_file_per_table = 1;
-create table t1
-(i int, f float, c char(100),
-primary key pk(i), index fidx(f))
-engine = innodb;
-insert into t1 values
-(1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c'),
-(4, 4.4, 'd'), (5, 5.5, 'e');
-select * from t1;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-4	4.4	d
-5	5.5	e
-set session debug = "+d,ib_trunc_crash_after_logging_complete";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select * from t1;
-i	f	c
-insert into t1 values
-(1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t1;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t1;
-use test;
-set global innodb_file_per_table = 1;
-create table t1
-(i int, f float, c char(100),
-primary key pk(i), index fidx(f))
-engine = innodb;
-insert into t1 values
-(1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c'),
-(4, 4.4, 'd'), (5, 5.5, 'e');
-select * from t1;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-4	4.4	d
-5	5.5	e
-set session debug = "+d,ib_trunc_crash_with_intermediate_log_checkpoint";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select * from t1;
-i	f	c
-drop table t1;
-use test;
-create table t (i int, j int) engine=innodb;
-insert into t values (1,1), (2,2), (3,3);
-select * from t;
-i	j
-1	1
-2	2
-3	3
-set session debug="+d,ib_err_trunc_oom_logging";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug="-d,ib_err_trunc_oom_logging";
-select * from t;
-i	j
-1	1
-2	2
-3	3
-select * from t;
-i	j
-1	1
-2	2
-3	3
-set session debug="+d,ib_err_trunc_writing_magic_number";
-truncate table t;
-select * from t;
-i	j
-insert into t values (1,1), (2,2), (3,3);
-select * from t;
-i	j
-1	1
-2	2
-3	3
-# Restart the MySQL server
-# restart
-select * from t;
-i	j
-1	1
-2	2
-3	3
-drop table t;
-use test;
-create table t (i int, j int, primary key pk(i), index idx(j)) engine=innodb;
-insert into t values (1,1), (2,2), (3,3);
-select * from t;
-i	j
-1	1
-2	2
-3	3
-set session debug="+d,ib_trunc_crash_after_updating_magic_no";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select * from t;
-i	j
-drop table t;
-use test;
-set global innodb_file_per_table = 0;
-create table t1 (i int, primary key pk(i)) engine=innodb;
-create table t2 (j int) engine=innodb;
-insert into t1 values (1), (2), (3), (4), (5);
-insert into t2 values (1), (2), (3), (4), (5);
-select * from t1;
-i
-1
-2
-3
-4
-5
-select * from t2;
-j
-1
-2
-3
-4
-5
-use test;
-use test;
-select * from t1;
-i
-1
-2
-3
-4
-5
-set DEBUG_SYNC='RESET';
-set DEBUG_SYNC='ib_trunc_table_trunc_completing SIGNAL trunc_completing WAIT_FOR trunc_continue';
-truncate table t1;
-set DEBUG_SYNC='now WAIT_FOR trunc_completing';
-select * from t2;
-j
-1
-2
-3
-4
-5
-truncate table t2;
-select * from t2;
-j
-set DEBUG_SYNC='now SIGNAL trunc_continue';
-select * from t1;
-i
-set DEBUG_SYNC='RESET';
-drop table t1;
-drop table t2;
-use test;
-set global innodb_file_per_table = 1;
-create table t1 (a int, b char(100), c char(100)) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 2000) DO
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-begin;
-call populate_t1();
-commit;
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-begin;
-update t1 set a = a + 1000;
-commit;
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-drop procedure populate_t1;
-drop table t1;
-use test;
-set global innodb_file_per_table = 1;
-create table t1 (a int, b char(100), c char(100)) engine = innodb;
-create table t2 (a int, b char(100), c char(100)) engine = innodb;
-create table t3 (a int, b char(100), c char(100)) engine = innodb;
-create procedure populate_t1()
-begin
-declare i int default 1;
-while (i <= 2000) DO
-insert into t1 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t2()
-begin
-declare i int default 1;
-while (i <= 2000) DO
-insert into t2 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_t3()
-begin
-declare i int default 1;
-while (i <= 2000) DO
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-begin;
-call populate_t1();
-call populate_t2();
-call populate_t3();
-commit;
-select count(*) from t1;
-count(*)
-2000
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-2000
-truncate table t2;
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-2000
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-begin;
-call populate_t1();
-call populate_t2();
-call populate_t3();
-commit;
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-2000
-select count(*) from t3;
-count(*)
-2000
-truncate table t1;
-truncate table t1;
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-drop procedure populate_t1;
-drop procedure populate_t2;
-drop procedure populate_t3;
-drop table t1, t2, t3;
-create table ibstd_33 (
-a int not null,
-d varchar(40) not null,
-b text not null,
-c text,
-index(d),
-index(a),
-primary key (b(16), a, d),
-fulltext ftsic(c)) engine=InnoDB row_format=dynamic;
-insert into ibstd_33 (a,d,b,c) values ('1','6',
-repeat('0.350557460150547arrclolullcocuraalaulloooclrcoulrccaoocourcrorooruruooauuauarrouccuoucrooaaouullrularcoarclloraaac','367'),
-repeat('0.0836047279001129oaalolrllcoulaoococrolooullocuaacocoaoloclouallruaalolaruucaloluraocorrlouuoaorloarrluaaorucu','534'));
-select count(*) from ibstd_33;
-count(*)
-1
-set session debug = "+d,ib_truncate_crash_while_fts_cleanup";
-truncate table ibstd_33;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-select count(*) from ibstd_33;
-ERROR 42S02: Table 'test.ibstd_33' doesn't exist
-drop table ibstd_33;
-CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT INDEX ft1(a,b(200))) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
-('Full-text indexes', 'are called collections'),
-('Only MyISAM tables','support collections'),
-('Function MATCH ... AGAINST()','is used to do a search'),
-('Full-text search in MySQL', 'implements vector space model');
-select * from t1 where MATCH(a,b) AGAINST ("collections");
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-select * from t1 where MATCH(a,b) AGAINST ("indexes");
-a	b
-Full-text indexes	are called collections
-select * from t1 where MATCH(a,b) AGAINST ("indexes collections");
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-select * from t1 where MATCH(a,b) AGAINST ("only");
-a	b
-Only MyISAM tables	support collections
-ALTER TABLE t1 DROP INDEX ft1;
-set session debug = "+d,ib_truncate_crash_while_fts_cleanup";
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
-('Full-text indexes', 'are called collections'),
-('Only MyISAM tables','support collections'),
-('Function MATCH ... AGAINST()','is used to do a search'),
-('Full-text search in MySQL', 'implements vector space model');
-ERROR 42S02: Table 'test.t1' doesn't exist
-select * from t1 where MATCH(a,b) AGAINST ("collections");
-ERROR 42S02: Table 'test.t1' doesn't exist
-drop table t1;
-set global innodb_file_per_table = default;
-set global innodb_strict_mode = default;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_1.result b/mysql-test/suite/innodb_zip/r/wl6501_1.result
deleted file mode 100644
index bf901804be5..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_1.result
+++ /dev/null
@@ -1,1202 +0,0 @@
-set global innodb_file_per_table=on;
-# Verify that 'TRUNCATE TABLE' statement works fine and the size
-# of .ibd file is equal to the initial size after truncation.
-drop table if exists t1,t2,t3,t4,t6;
-Warnings:
-Note	1051	Unknown table 'test.t1'
-Note	1051	Unknown table 'test.t2'
-Note	1051	Unknown table 'test.t3'
-Note	1051	Unknown table 'test.t4'
-Note	1051	Unknown table 'test.t6'
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_during_drop_index_temp_table";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_during_drop_index_temp_table point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t5;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_drop_of_sec_index point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_drop_of_sec_index point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_drop_of_sec_index point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_drop_of_sec_index point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_drop_reinit_done_create_to_start---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t5;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_create_of_sec_index---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_create_of_sec_index---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_create_of_sec_index---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_on_create_of_sec_index---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_before_log_removal point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_before_log_removal point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_before_log_removal point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_before_log_removal point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_truncate_done point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
-create table t1(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=redundant;
-create table t2(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compact;
-create table t3(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=compressed key_block_size=4;
-create table t4(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb row_format=dynamic;
-create temporary table t5(c1 int not null,
-c2 int not null,
-c3 char(255) not null,
-c4 text(500) not null,
-c5 blob(500) not null,
-c6 varchar(500) not null,
-c7 varchar(500) not null,
-c8 datetime,
-c9 decimal(5,3),
-primary key (c1),
-index (c3,c4(50),c5(50)),
-index (c2))
-engine=innodb;
-create table t6 ( a int ) engine = innodb;
-insert into t6 values (50),(100),(150);
-select count(*) from t1;
-count(*)
-3
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-count(*)
-3
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_redo_log_write_complete point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t1;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-3
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_redo_log_write_complete point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t2;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-3
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_redo_log_write_complete point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t3;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-3
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-set session debug="+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-"---debug ib_trunc_crash_after_redo_log_write_complete point---"
-# Write file to make mysql-test-run.pl expect crash and restart
-# Run the crashing query
-truncate table t4;
-ERROR HY000: Lost connection to MySQL server during query
-# Restart the MySQL server
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-select count(*) from t4;
-count(*)
-0
-select count(*) from t5;
-ERROR 42S02: Table 'test.t5' doesn't exist
-select count(*) from t6;
-count(*)
-3
-drop table t1, t2, t3, t4, t6;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result
deleted file mode 100644
index 554bb2892f6..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_crash_3.result
+++ /dev/null
@@ -1,462 +0,0 @@
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-set global innodb_file_per_table = on;
-"1. Hit crash point while writing redo log."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine=innodb row_format=compressed
-key_block_size=16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_while_writing_redo_log";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point on completion of redo log write."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Hit crash point while dropping indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"4. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"5. Hit crash point while creating indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"6. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"7. Hit crash point before/after log checkpoint is done."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-set global innodb_file_per_table = 1;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result
deleted file mode 100644
index d766ecceaac..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_crash_4.result
+++ /dev/null
@@ -1,519 +0,0 @@
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-set global innodb_file_per_table = on;
-"1. Hit crash point while writing redo log."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine=innodb row_format=compressed
-key_block_size=4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_while_writing_redo_log";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point on completion of redo log write."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Hit crash point while dropping indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"4. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"5. Hit crash point while creating indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"6. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"7. Hit crash point before/after log checkpoint is done."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-set global innodb_file_per_table = 1;
-call mtr.add_suppression("does not exist in the InnoDB internal");
-set global innodb_file_per_table = on;
-"1. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-set global innodb_file_per_table = 1;
-set innodb_strict_mode=off;
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	Error	Table 'test.t' doesn't exist
-test.t	check	status	Operation failed
-"2. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-set global innodb_file_per_table = 1;
-set innodb_strict_mode=off;
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	Error	Table 'test.t' doesn't exist
-test.t	check	status	Operation failed
-set global innodb_file_per_table = 1;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result b/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result
deleted file mode 100644
index b5fea6382ff..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_crash_5.result
+++ /dev/null
@@ -1,462 +0,0 @@
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-set global innodb_file_per_table = on;
-"1. Hit crash point while writing redo log."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine=innodb row_format=compressed
-key_block_size=8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_while_writing_redo_log";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point on completion of redo log write."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Hit crash point while dropping indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_drop_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"4. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"5. Hit crash point while creating indexes."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_clust_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_uniq_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_create_of_sec_index";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"6. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"7. Hit crash point before/after log checkpoint is done."
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_before_log_removal";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-use test;
-set global innodb_file_per_table = 1;
-SET innodb_strict_mode=OFF;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_truncate_done";
-Warnings:
-Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-set global innodb_file_per_table = 1;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_debug.result b/mysql-test/suite/innodb_zip/r/wl6501_debug.result
deleted file mode 100644
index 9d712485a7f..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_debug.result
+++ /dev/null
@@ -1,390 +0,0 @@
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-"1. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Post truncate recovery, abruptly shutdown the server."
-"   On restart ensure table state is maintained."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-# Kill and restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-"1. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Post truncate recovery, abruptly shutdown the server."
-"   On restart ensure table state is maintained."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-# Kill and restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-call mtr.add_suppression("The file '.*' already exists though the corresponding table did not exist in the InnoDB data dictionary");
-call mtr.add_suppression("Cannot create file '.*'");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'");
-"1. Hit crash point on completing drop of all indexes before creation"
-"   of index is commenced."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"2. Hit crash point after data is updated to system-table and"
-"   in-memory dict."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_on_updating_dict_sys_info";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
-"3. Post truncate recovery, abruptly shutdown the server."
-"   On restart ensure table state is maintained."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set innodb_strict_mode=off;
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-set session debug = "+d,ib_trunc_crash_after_redo_log_write_complete";
-truncate table t;
-ERROR HY000: Lost connection to MySQL server during query
-# restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-# Kill and restart
-check table t;
-Table	Op	Msg_type	Msg_text
-test.t	check	status	OK
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-select * from t where f < 2.5;
-i	f	c
-1	1.1	a
-2	2.2	b
-drop table t;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_error_1.result b/mysql-test/suite/innodb_zip/r/wl6501_error_1.result
deleted file mode 100644
index 53eab9dcc1b..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_error_1.result
+++ /dev/null
@@ -1,865 +0,0 @@
-set global innodb_file_per_table = on;
-set innodb_strict_mode=off;
-"1. Error in assigning undo logs for truncate action."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"2. Error while preparing for truncate."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"3. Error while dropping/creating indexes"
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_drop_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_drop_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_create_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_create_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"4. Error while completing truncate of table involving FTS."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compact
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"5. Error while updating sys-tables."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compact
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-select * from t order by i;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_format = Barracuda;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set global innodb_file_per_table = 1;
-set global innodb_file_per_table = on;
-set innodb_strict_mode=off;
-"1. Error in assigning undo logs for truncate action."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"2. Error while preparing for truncate."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"3. Error while dropping/creating indexes"
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_drop_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_drop_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_create_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_create_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compact
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"4. Error while completing truncate of table involving FTS."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compact
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"5. Error while updating sys-tables."
-set global innodb_file_per_table = 0;
-set global innodb_file_format = 'Antelope';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compact
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-select * from t order by i;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_format = Barracuda;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set global innodb_file_per_table = 1;
-set global innodb_file_per_table = on;
-set innodb_strict_mode=off;
-"1. Error in assigning undo logs for truncate action."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"2. Error while preparing for truncate."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"3. Error while dropping/creating indexes"
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_drop_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_drop_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_create_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_create_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 4;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"4. Error while completing truncate of table involving FTS."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=4;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"5. Error while updating sys-tables."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=4;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-select * from t order by i;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_format = Barracuda;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set global innodb_file_per_table = 1;
-set global innodb_file_per_table = on;
-set innodb_strict_mode=off;
-"1. Error in assigning undo logs for truncate action."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"2. Error while preparing for truncate."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"3. Error while dropping/creating indexes"
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_drop_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_drop_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_create_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_create_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 8;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"4. Error while completing truncate of table involving FTS."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=8;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"5. Error while updating sys-tables."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=8;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-select * from t order by i;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_format = Barracuda;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set global innodb_file_per_table = 1;
-set global innodb_file_per_table = on;
-set innodb_strict_mode=off;
-"1. Error in assigning undo logs for truncate action."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_assigning_undo_log";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_assigning_undo_log";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"2. Error while preparing for truncate."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_preparing_for_truncate";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_preparing_for_truncate";
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-drop table t;
-"3. Error while dropping/creating indexes"
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_drop_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_drop_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_create_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_create_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create temporary table t (
-i int, f float, c char,
-primary key pk(i), unique findex(f), index ck(c))
-engine = innodb row_format = compressed
-key_block_size = 16;
-insert into t values (1, 1.1, 'a'), (2, 2.2, 'b'), (3, 3.3, 'c');
-select * from t;
-i	f	c
-1	1.1	a
-2	2.2	b
-3	3.3	c
-set session debug = "+d,ib_err_trunc_temp_recreate_index";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_temp_recreate_index";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"4. Error while completing truncate of table involving FTS."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_fts_trunc";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_fts_trunc";
-select * from t;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-"5. Error while updating sys-tables."
-set global innodb_file_per_table = 1;
-set global innodb_file_format = 'Barracuda';
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-create  table t (i int, f float, c char(100),
-primary key pk(i), index fk(f), fulltext index ck(c))
-engine=innodb row_format=compressed
-key_block_size=16;
-insert into t values (1, 1.1, 'mysql is now oracle company'),
-(2, 2.2, 'innodb is part of mysql'),
-(3, 3.3, 'innodb is default storage engine of mysql');
-select * from t order by i;
-i	f	c
-1	1.1	mysql is now oracle company
-2	2.2	innodb is part of mysql
-3	3.3	innodb is default storage engine of mysql
-set session debug = "+d,ib_err_trunc_during_sys_table_update";
-truncate table t;
-ERROR HY000: Got error 168 from storage engine
-set session debug = "-d,ib_err_trunc_during_sys_table_update";
-select * from t order by i;
-ERROR HY000: Operation cannot be performed. The table 'test.t' is missing, corrupt or contains bad data.
-drop table t;
-set global innodb_file_format = Barracuda;
-Warnings:
-Warning	131	Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
-set global innodb_file_per_table = 1;
diff --git a/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result b/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result
deleted file mode 100644
index 933e407623d..00000000000
--- a/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result
+++ /dev/null
@@ -1,354 +0,0 @@
-set innodb_strict_mode=OFF;
-create procedure populate()
-begin
-declare i int default 1;
-while (i <= 5000) do
-insert into t1 values (i, 'a', 'b');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_small()
-begin
-declare i int default 10001;
-while (i <= 12000) do
-insert into t1 values (i, 'c', 'd');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-set global innodb_file_per_table = 1;
-create table tNUMBER
-(i int, cNUMBER char(NUMBER), cNUMBER char(NUMBER),
-index cNUMBER_idx(cNUMBER))
-engine=innodb row_format=compact
-key_block_size=NUMBER;
-Warnings:
-Warning	NUMBER	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	NUMBER	InnoDB: ignoring KEY_BLOCK_SIZE=NUMBER.
-create table t2
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compact
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-create temporary table t3
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compact
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-begin;
-call populate();
-commit;
-select count(*) from t1;
-count(*)
-5000
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-call populate_small();
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-7000
-select count(*) from t3;
-count(*)
-7000
-truncate table t2;
-truncate table t3;
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-call populate_small();
-select count(*) from t1;
-count(*)
-4000
-select count(*) from t2;
-count(*)
-2000
-select count(*) from t3;
-count(*)
-2000
-drop table t1;
-drop table t2;
-drop table t3;
-drop procedure populate;
-drop procedure populate_small;
-set global innodb_file_format = Antelope;
-set global innodb_file_per_table = 1;
-set innodb_strict_mode=OFF;
-create procedure populate()
-begin
-declare i int default 1;
-while (i <= 5000) do
-insert into t1 values (i, 'a', 'b');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_small()
-begin
-declare i int default 10001;
-while (i <= 12000) do
-insert into t1 values (i, 'c', 'd');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-set global innodb_file_per_table = 1;
-create table tNUMBER
-(i int, cNUMBER char(NUMBER), cNUMBER char(NUMBER),
-index cNUMBER_idx(cNUMBER))
-engine=innodb row_format=compressed
-key_block_size=NUMBER;
-Warnings:
-Warning	NUMBER	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	NUMBER	InnoDB: ignoring KEY_BLOCK_SIZE=NUMBER.
-Warning	NUMBER	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Warning	NUMBER	InnoDB: assuming ROW_FORMAT=COMPACT.
-create table t2
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compressed
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-create temporary table t3
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compressed
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-begin;
-call populate();
-commit;
-select count(*) from t1;
-count(*)
-5000
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-call populate_small();
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-7000
-select count(*) from t3;
-count(*)
-7000
-truncate table t2;
-truncate table t3;
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-call populate_small();
-select count(*) from t1;
-count(*)
-4000
-select count(*) from t2;
-count(*)
-2000
-select count(*) from t3;
-count(*)
-2000
-drop table t1;
-drop table t2;
-drop table t3;
-drop procedure populate;
-drop procedure populate_small;
-set global innodb_file_format = Antelope;
-set global innodb_file_per_table = 1;
-set innodb_strict_mode=OFF;
-create procedure populate()
-begin
-declare i int default 1;
-while (i <= 5000) do
-insert into t1 values (i, 'a', 'b');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-create procedure populate_small()
-begin
-declare i int default 10001;
-while (i <= 12000) do
-insert into t1 values (i, 'c', 'd');
-insert into t2 values (i, 'a', 'b');
-insert into t3 values (i, 'a', 'b');
-set i = i + 1;
-end while;
-end|
-set global innodb_file_per_table = 0;
-create table tNUMBER
-(i int, cNUMBER char(NUMBER), cNUMBER char(NUMBER),
-index cNUMBER_idx(cNUMBER))
-engine=innodb row_format=compact
-key_block_size=NUMBER;
-Warnings:
-Warning	NUMBER	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	NUMBER	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	NUMBER	InnoDB: ignoring KEY_BLOCK_SIZE=NUMBER.
-create table t2
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compact
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-create temporary table t3
-(i int, c1 char(100), c2 char(100),
-index c1_idx(c1))
-engine=innodb row_format=compact
-key_block_size=16;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16.
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-begin;
-call populate();
-commit;
-select count(*) from t1;
-count(*)
-5000
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-truncate table t1;
-select count(*) from t1;
-count(*)
-0
-select count(*) from t2;
-count(*)
-5000
-select count(*) from t3;
-count(*)
-5000
-call populate_small();
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-7000
-select count(*) from t3;
-count(*)
-7000
-truncate table t2;
-truncate table t3;
-select count(*) from t1;
-count(*)
-2000
-select count(*) from t2;
-count(*)
-0
-select count(*) from t3;
-count(*)
-0
-call populate_small();
-select count(*) from t1;
-count(*)
-4000
-select count(*) from t2;
-count(*)
-2000
-select count(*) from t3;
-count(*)
-2000
-drop table t1;
-drop table t2;
-drop table t3;
-drop procedure populate;
-drop procedure populate_small;
-set global innodb_file_format = Antelope;
-set global innodb_file_per_table = 1;
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_1.opt b/mysql-test/suite/innodb_zip/t/wl6501_1.opt
deleted file mode 100644
index 6966a4e3352..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_1.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_page_size=16384
\ No newline at end of file
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_1.test b/mysql-test/suite/innodb_zip/t/wl6501_1.test
deleted file mode 100644
index c054d54c34a..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_1.test
+++ /dev/null
@@ -1,450 +0,0 @@
-
-####################################################################
-# TC to check truncate table statement atomicity for single        #
-# tablespace                                                       #
-# Sceanrio covered:                                                #
-# 1. Debug points added for worklog                                #
-# 2. Table with  differnt row types                                #
-# 3. Transactional statement.                                      #
-####################################################################
-
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would result in a "long semaphore wait" inside InnoDB
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-#-----------------------------------------------------------------------
---disable_query_log
-let $MYSQL_DATA_DIR= `select @@datadir`;
-let $data_directory = data directory='$MYSQL_TMP_DIR/alt_dir';
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-
-call mtr.add_suppression("InnoDB.*table did not exist in the InnoDB data dictionary.*");
-call mtr.add_suppression("InnoDB: A page in the doublewrite buffer is not within space bounds.*");
-call mtr.add_suppression("InnoDB: Cannot create file.*");
-call mtr.add_suppression("InnoDB: Error number 17 means 'File exists'.*");
-call mtr.add_suppression("InnoDB: A page in the doublewrite buffer is not within space bounds");
-call mtr.add_suppression("InnoDB: Error: table .* does not exist in the InnoDB internal");
---enable_query_log
-
-#-----------------------------------------------------------------------
-set global innodb_file_per_table=on;
---echo # Verify that 'TRUNCATE TABLE' statement works fine and the size
---echo # of .ibd file is equal to the initial size after truncation.
-
-#-----------------------------------------------------------------------
-drop table if exists t1,t2,t3,t4,t6;
-let $cnt = 6;
-while ($cnt) {
-
-	# table with basic data type + primary ,secondary,composite,prefix index
-	create table t1(c1 int not null,
-			c2 int not null,
-			c3 char(255) not null,
-			c4 text(500) not null,
-			c5 blob(500) not null,
-			c6 varchar(500) not null,
-			c7 varchar(500) not null,
-			c8 datetime,
-			c9 decimal(5,3),
-			primary key (c1),
-			index (c3,c4(50),c5(50)),
-			index (c2))
-		engine=innodb row_format=redundant;
-
-
-	create table t2(c1 int not null,
-			c2 int not null,
-			c3 char(255) not null,
-			c4 text(500) not null,
-			c5 blob(500) not null,
-			c6 varchar(500) not null,
-			c7 varchar(500) not null,
-			c8 datetime,
-			c9 decimal(5,3),
-			primary key (c1),
-			index (c3,c4(50),c5(50)),
-			index (c2))
-		engine=innodb row_format=compact;
-
-
-	# with row type , key block size = 4K
-	create table t3(c1 int not null,
-			c2 int not null,
-			c3 char(255) not null,
-			c4 text(500) not null,
-			c5 blob(500) not null,
-			c6 varchar(500) not null,
-			c7 varchar(500) not null,
-			c8 datetime,
-			c9 decimal(5,3),
-			primary key (c1),
-			index (c3,c4(50),c5(50)),
-			index (c2))
-		engine=innodb row_format=compressed key_block_size=4;
-
-
-	create table t4(c1 int not null,
-			c2 int not null,
-			c3 char(255) not null,
-			c4 text(500) not null,
-			c5 blob(500) not null,
-			c6 varchar(500) not null,
-			c7 varchar(500) not null,
-			c8 datetime,
-			c9 decimal(5,3),
-			primary key (c1),
-			index (c3,c4(50),c5(50)),
-			index (c2))
-		engine=innodb row_format=dynamic;
-
-
-	create temporary table t5(c1 int not null,
-				  c2 int not null,
-				  c3 char(255) not null,
-				  c4 text(500) not null,
-				  c5 blob(500) not null,
-				  c6 varchar(500) not null,
-				  c7 varchar(500) not null,
-				  c8 datetime,
-				  c9 decimal(5,3),
-				  primary key (c1),
-				  index (c3,c4(50),c5(50)),
-				  index (c2))
-		engine=innodb;
-
-	create table t6 ( a int ) engine = innodb;
-	insert into t6 values (50),(100),(150);
-
-	--disable_query_log
-	--disable_result_log
-	let $n=5;
-
-	# load created tables.
-	while ($n)
-	{
-		start transaction;
-
-		eval insert ignore into t1 values(
-			$n, $n,
-			repeat(concat(' tc3_',$n), 42),
-			repeat(concat(' tc4_',$n), 300),
-			repeat(concat(' tc5_',$n), 300),
-			repeat(concat(' tc6_',$n), 300),
-			repeat(concat(' tc7_',$n), 300),
-			now(), (100.55+$n));
-
-		eval insert ignore into t2 values(
-			$n, $n,
-			repeat(concat(' tc3_',$n), 42),
-			repeat(concat(' tc4_',$n), 300),
-			repeat(concat(' tc5_',$n), 300),
-			repeat(concat(' tc6_',$n), 300),
-			repeat(concat(' tc7_',$n), 300),
-			now(), (100.55+$n));
-
-		eval insert ignore into t3 values(
-			$n, $n,
-			repeat(concat(' tc3_',$n), 42),
-			repeat(concat(' tc4_',$n), 300),
-			repeat(concat(' tc5_',$n), 300),
-			repeat(concat(' tc6_',$n), 300),
-			repeat(concat(' tc7_',$n), 300),
-			now(), (100.55+$n));
-
-		eval insert ignore into t4 values(
-			$n, $n,
-			repeat(concat(' tc3_',$n), 42),
-			repeat(concat(' tc4_',$n), 300),
-			repeat(concat(' tc5_',$n), 300),
-			repeat(concat(' tc6_',$n), 300),
-			repeat(concat(' tc7_',$n), 300),
-			now(), (100.55+$n));
-
-		eval insert ignore into t5 values(
-			$n, $n,
-			repeat(concat(' tc3_',$n), 42),
-			repeat(concat(' tc4_',$n), 300),
-			repeat(concat(' tc5_',$n), 300),
-			repeat(concat(' tc6_',$n), 300),
-			repeat(concat(' tc7_',$n), 300),
-			now(), (100.55+$n));
-
-		if ($n <= 3)
-		{
-			commit;
-		}
-
-		if ($n > 3)
-		{
-			rollback;
-		}
-
-		dec $n;
-	}
-
-	# validate loading of the tables.
-	--enable_result_log
-	--enable_query_log
-	select count(*) from t1;
-	select count(*) from t2;
-	select count(*) from t3;
-	select count(*) from t4;
-	select count(*) from t5;
-	select count(*) from t6;
-
-	# set the debug crash point and exercise them.
-	if ($cnt == 6)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_during_drop_index_temp_table";
-		--echo "---debug ib_trunc_crash_during_drop_index_temp_table point---"
-	}
-	if ($cnt == 5)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_drop_reinit_done_create_to_start";
-		--echo "---debug ib_trunc_crash_drop_reinit_done_create_to_start---"
-	}
-
-	if ($cnt >= 5) {
-		--echo # Write file to make mysql-test-run.pl expect crash and restart
-		--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-		--echo # Run the crashing query
-		--error 2013
-		truncate table t5;
-		--source include/wait_until_disconnected.inc
-		--enable_reconnect
-		--echo # Restart the MySQL server
-		--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-		--source include/wait_until_connected_again.inc
-		--disable_reconnect
-		select count(*) from t1;
-		select count(*) from t2;
-		select count(*) from t3;
-		select count(*) from t4;
-		--error ER_NO_SUCH_TABLE
-		select count(*) from t5;
-		select count(*) from t6;
-	}
-
-	# set the debug crash point and exercise them.
-	if ($cnt == 6)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_drop_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_drop_of_sec_index point---"
-	}
-	if ($cnt == 5)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_create_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_create_of_sec_index---"
-	}
-	if ($cnt == 4)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_before_log_removal";
-		--echo "---debug ib_trunc_crash_before_log_removal point---"
-	}
-	if ($cnt == 3)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 2)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 1)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_redo_log_write_complete";
-		--echo "---debug ib_trunc_crash_after_redo_log_write_complete point---"
-	}
-
-	--echo # Write file to make mysql-test-run.pl expect crash and restart
-	--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--echo # Run the crashing query
-	--error 2013
-	truncate table t1;
-	--source include/wait_until_disconnected.inc
-	--enable_reconnect
-	--echo # Restart the MySQL server
-	--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--source include/wait_until_connected_again.inc
-	--disable_reconnect
-	select count(*) from t1;
-	select count(*) from t2;
-	select count(*) from t3;
-	select count(*) from t4;
-	--error ER_NO_SUCH_TABLE
-	select count(*) from t5;
-	select count(*) from t6;
-
-	if ($cnt == 6)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_drop_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_drop_of_sec_index point---"
-	}
-	if ($cnt == 5)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_create_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_create_of_sec_index---"
-	}
-	if ($cnt == 4)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_before_log_removal";
-		--echo "---debug ib_trunc_crash_before_log_removal point---"
-	}
-	if ($cnt == 3)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 2)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 1)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_redo_log_write_complete";
-		--echo "---debug ib_trunc_crash_after_redo_log_write_complete point---"
-	}
-
-
-	--echo # Write file to make mysql-test-run.pl expect crash and restart
-	--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--echo # Run the crashing query
-	--error 2013
-	truncate table t2;
-	--source include/wait_until_disconnected.inc
-	--enable_reconnect
-	--echo # Restart the MySQL server
-	--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--source include/wait_until_connected_again.inc
-	--disable_reconnect
-	select count(*) from t1;
-	select count(*) from t2;
-	select count(*) from t3;
-	select count(*) from t4;
-	--error ER_NO_SUCH_TABLE
-	select count(*) from t5;
-	select count(*) from t6;
-
-	if ($cnt == 6)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_drop_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_drop_of_sec_index point---"
-	}
-	if ($cnt == 5)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_create_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_create_of_sec_index---"
-	}
-	if ($cnt == 4)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_before_log_removal";
-		--echo "---debug ib_trunc_crash_before_log_removal point---"
-	}
-	if ($cnt == 3)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 2)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 1)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_redo_log_write_complete";
-		--echo "---debug ib_trunc_crash_after_redo_log_write_complete point---"
-	}
-
-
-	--echo # Write file to make mysql-test-run.pl expect crash and restart
-	--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--echo # Run the crashing query
-	--error 2013
-	truncate table t3;
-	--source include/wait_until_disconnected.inc
-	--enable_reconnect
-	--echo # Restart the MySQL server
-	--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--source include/wait_until_connected_again.inc
-	--disable_reconnect
-	select count(*) from t1;
-	select count(*) from t2;
-	select count(*) from t3;
-	select count(*) from t4;
-	--error ER_NO_SUCH_TABLE
-	select count(*) from t5;
-	select count(*) from t6;
-
-
-	if ($cnt == 6)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_drop_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_drop_of_sec_index point---"
-	}
-	if ($cnt == 5)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_on_create_of_sec_index";
-		--echo "---debug ib_trunc_crash_on_create_of_sec_index---"
-	}
-	if ($cnt == 4)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_before_log_removal";
-		--echo "---debug ib_trunc_crash_before_log_removal point---"
-	}
-	if ($cnt == 3)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 2)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_truncate_done";
-		--echo "---debug ib_trunc_crash_after_truncate_done point---"
-	}
-	if ($cnt == 1)
-	{
-		SET SESSION debug_dbug="+d,ib_trunc_crash_after_redo_log_write_complete";
-		--echo "---debug ib_trunc_crash_after_redo_log_write_complete point---"
-	}
-
-	--echo # Write file to make mysql-test-run.pl expect crash and restart
-	--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--echo # Run the crashing query
-	--error 2013
-	truncate table t4;
-	--source include/wait_until_disconnected.inc
-	--enable_reconnect
-	--echo # Restart the MySQL server
-	--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-	--source include/wait_until_connected_again.inc
-	--disable_reconnect
-	select count(*) from t1;
-	select count(*) from t2;
-	select count(*) from t3;
-	select count(*) from t4;
-	--error ER_NO_SUCH_TABLE
-	select count(*) from t5;
-	select count(*) from t6;
-
-	drop table t1, t2, t3, t4, t6;
-
-	dec $cnt;
-
-	--disable_query_log
-	eval set global innodb_file_per_table=$innodb_file_per_table_orig;
-	--enable_query_log
-}
-
-
-
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_3.opt b/mysql-test/suite/innodb_zip/t/wl6501_crash_3.opt
deleted file mode 100644
index 6966a4e3352..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_3.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_page_size=16384
\ No newline at end of file
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_3.test b/mysql-test/suite/innodb_zip/t/wl6501_crash_3.test
deleted file mode 100644
index 8d938ab5db8..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_3.test
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
-# TC tries to hit crash point during truncate of
-# compressed non-temp table residing in single tablespace
-# with page-size=16k
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-let $innodb_file_format_orig=`select @@innodb_file_format`;
-SET GLOBAL innodb_file_format=Barracuda;
-let $wl6501_file_per_table = 1;
-let $wl6501_row_fmt = compressed;
-let $wl6501_kbs = 16;
---source include/innodb_wl6501_crash.inc
-eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_4.opt b/mysql-test/suite/innodb_zip/t/wl6501_crash_4.opt
deleted file mode 100644
index 67124777fd9..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_4.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_page_size=4096
\ No newline at end of file
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_4.test b/mysql-test/suite/innodb_zip/t/wl6501_crash_4.test
deleted file mode 100644
index b042715ed94..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_4.test
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
-# TC tries to hit crash point during truncate of
-# compressed non-temp table residing in single tablespace.
-# with page-size=4k
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-let $wl6501_file_per_table = 1;
-let $wl6501_row_fmt = compressed;
-let $wl6501_kbs = 4;
---source suite/innodb/include/innodb_wl6501_crash.inc
-
-let $wl6501_temp = temporary;
---source suite/innodb/include/innodb_wl6501_crash_temp.inc
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_5.opt b/mysql-test/suite/innodb_zip/t/wl6501_crash_5.opt
deleted file mode 100644
index f0fc19df677..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_5.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_page_size=8192
\ No newline at end of file
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_crash_5.test b/mysql-test/suite/innodb_zip/t/wl6501_crash_5.test
deleted file mode 100644
index 9686f5aa6a1..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_crash_5.test
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
-# TC tries to hit crash point during truncate of
-# compressed non-temp table residing in single tablespace.
-# with page-size=8k
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-let $wl6501_file_per_table = 1;
-let $wl6501_row_fmt = compressed;
-let $wl6501_kbs = 8;
---source suite/innodb/include/innodb_wl6501_crash.inc
-
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_scale_1.opt b/mysql-test/suite/innodb_zip/t/wl6501_scale_1.opt
deleted file mode 100644
index 6966a4e3352..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_scale_1.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_page_size=16384
\ No newline at end of file
diff --git a/mysql-test/suite/innodb_zip/t/wl6501_scale_1.test b/mysql-test/suite/innodb_zip/t/wl6501_scale_1.test
deleted file mode 100644
index 988f76e1151..00000000000
--- a/mysql-test/suite/innodb_zip/t/wl6501_scale_1.test
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# WL#6501: make truncate table atomic
-#
-
-# load table with some significiant amount of data
-# and then try truncate
-
---source include/have_innodb.inc
---source include/have_debug.inc
---source include/big_test.inc
-
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
---source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-
-# Single-Tablespace/Non-Compressed
-let $wl6501_file_per_table = 1;
-let $wl6501_row_fmt = compact;
-let $wl6501_kbs = 16;
---source suite/innodb_zip/include/innodb_wl6501_scale.inc
-
-# Single-Tablespace/Compressed
-let $wl6501_file_per_table = 1;
-let $wl6501_row_fmt = compressed;
-let $wl6501_kbs = 16;
---source suite/innodb_zip/include/innodb_wl6501_scale.inc
-
-# System-Tablespace/Non-Compressed
-let $wl6501_file_per_table = 0;
-let $wl6501_row_fmt = compact;
-let $wl6501_kbs = 16;
---source suite/innodb_zip/include/innodb_wl6501_scale.inc