Revert MDEV-25292 Atomic CREATE OR REPLACE TABLE

Specifically:

Revert "MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection"
This reverts commit ba875e939619baefb08936863a889830f595e426.

Revert "MDEV-29620 Assertion `next_insert_id == 0' failed in handler::ha_external_lock"
This reverts commit aa08a7442a5141750de96353132c7799e10c9302.

Revert "MDEV-29628 Memory leak after CREATE OR REPLACE with foreign key"
This reverts commit c579d66ba689c8a20a951de5e6be2e1bc255ba7f.

Revert "MDEV-29609 create_not_windows test fails with different result"
This reverts commit cb583b2f1bf1c910e82c7caee4a53e0f3ff954ba.

Revert "MDEV-29544 SIGSEGV in HA_CREATE_INFO::finalize_locked_tables"
This reverts commit dcd66c3814991e686615eac2e65d01a7fa80cb66.

Revert "MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name"
This reverts commit cf6c5176328c8fbfadac80f337ef285732cc8d06.

Revert "MDEV-28933 Moved RENAME_CONSTRAINT_IDS to include/sql_funcs.h"
This reverts commit f1e1c1335b506905244502ee8584736a17a6ecd0.

Revert "MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES"
This reverts commit a228ec80e30cae59c2057b786fd3559171ce794f.

Revert "MDEV-25292 gcol.gcol_bugfixes --ps fix"
This reverts commit 24fff8267d0722b20ca780cf144ce27560df1394.

Revert "MDEV-25292 Disable atomic replace for slave-generated or-replace"
This reverts commit 2af15914cb3ae204d3b413995a96c7722ad60d93.

Revert "MDEV-25292 backup_log improved"
This reverts commit 34398a20b5829f0508c78bc8f765f7bef6e0ad48.

Revert "MDEV-25292 Atomic CREATE OR REPLACE TABLE"
This reverts commit 93c8252f02faa8ad8dc5f005e52f1990c29d4a0d.

Revert "MDEV-25292 Table_name class for (db, table_name, alias)"
This reverts commit d145dda9c7b6db394edf7150cc255343a4a7b116.

Revert "MDEV-25292 ha_table_exists() cleanup and improvement"
This reverts commit 409b8a86de45efc96377c618a99cff1301523150.

Revert "MDEV-25292 Cleanups"
This reverts commit 595dad83ad3c23879c59deec1173ea16b47871ed.

Revert "MDEV-25292 Refactoring: moved select_field_count into Alter_info."
This reverts commit f02af1d2295f108d96671b5a4f731ec998002dd5.

51 files changed, 587 insertions, 7575 deletions

diff --git a/mysql-test/include/binlog_formats.combinations b/mysql-test/include/binlog_formats.combinations
deleted file mode 100644
index 07042c2cbec..00000000000
--- a/mysql-test/include/binlog_formats.combinations
+++ /dev/null
@@ -1,8 +0,0 @@
-[row]
-binlog-format=row
-
-[stmt]
-binlog-format=statement
-
-[mix]
-binlog-format=mixed
diff --git a/mysql-test/include/binlog_formats.inc b/mysql-test/include/binlog_formats.inc
deleted file mode 100644
index 44d64293102..00000000000
--- a/mysql-test/include/binlog_formats.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file adds combinations for all binlog formats: row, stmt, mix
-# Under each combination a corresponding binlog-format option is set.
-
---source include/have_log_bin.inc
diff --git a/mysql-test/main/backup_log.inc b/mysql-test/main/backup_log.inc
index 4ad6b9122cd..f553a3b9527 100644
--- a/mysql-test/main/backup_log.inc
+++ b/mysql-test/main/backup_log.inc
@@ -7,7 +7,7 @@
 #              non-partitioned testing
 
 --echo #
---echo # Testing normal tables
+--echo # Testing with normal tables
 --echo #
 
 eval create table t1 (a int) engine=myisam $part_int;
@@ -20,8 +20,6 @@ repair table t1;
 optimize table t1;
 drop table t1;
 
---source backup_log_print.inc
-
 eval create table t1_innodb (a int) engine=innodb $part_int;
 insert into t1_innodb values (1),(2);
 alter table t1_innodb add column b int;
@@ -32,8 +30,6 @@ repair table t1_innodb;
 optimize table t1_innodb;
 drop table t1_innodb;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing with temporary tables (should not be logged)
 --echo #
@@ -45,8 +41,6 @@ rename table tmp_t11 to tmp_t10;
 truncate table tmp_t10;
 drop table tmp_t10;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing with mix of normal and temporary tables
 --echo #
@@ -60,8 +54,6 @@ eval create table t21 (a int) $part_int;
 drop temporary table if exists tmp_t21,t21;
 drop table if exists tmp_t21,t21;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing create select
 --echo #
@@ -76,8 +68,6 @@ eval create or replace table t31 (a int primary key) $part_int select * from t30
 eval create table t32 (a int) $part_int;
 drop table if exists t30,t31,t32,tmp_t30;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing create LIKE
 --echo #
@@ -91,8 +81,6 @@ create or replace table t42 like t41;
 show create table t42;
 drop table t40, t41, t42;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing rename
 --echo #
@@ -103,8 +91,6 @@ rename table t50 to t52, t51 to t53;
 rename table t52 to tmp, t53 to t52, tmp to t53;
 drop table t52,t53;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing enable/disable keys
 --echo #
@@ -121,8 +107,6 @@ INSERT INTO t61 VALUES(1),(2),(3);
 ALTER TABLE t61 DISABLE KEYS;
 DROP TABLE t61;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing load data
 --echo #
@@ -144,8 +128,6 @@ insert into t71 select * from t70;
 unlock tables;
 drop table t70,t71;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing strange table names
 --echo #
@@ -153,8 +135,6 @@ drop table t70,t71;
 eval create table `t 1` (a int) $part_int;
 drop table `t 1`;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing views and triggers
 --echo #
@@ -166,8 +146,6 @@ drop trigger trg;
 drop view v1;
 drop table t80;
 
---source backup_log_print.inc
-
 --echo #
 --echo # Testing alter to a new storage engine
 --echo #
@@ -175,5 +153,3 @@ drop table t80;
 eval create table t85 (a int primary key, b int) engine=myisam $part_int;
 alter table t85 engine=innodb;
 drop table t85;
-
---source backup_log_print.inc
diff --git a/mysql-test/main/backup_log.result b/mysql-test/main/backup_log.result
index 9b86c19ae40..cc8d098825d 100644
--- a/mysql-test/main/backup_log.result
+++ b/mysql-test/main/backup_log.result
@@ -4,7 +4,7 @@ connect  con1,localhost,root,,;
 BACKUP STAGE START;
 connection default;
 #
-# Testing normal tables
+# Testing with normal tables
 #
 create table t1 (a int) engine=myisam ;
 insert into t1 values (1),(2);
@@ -19,16 +19,6 @@ optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 drop table t1;
-#
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t1,id: 1,,0,,,
-ALTER,MyISAM,0,test,t1,id: 1,MyISAM,0,test,t1,id: 2
-RENAME,MyISAM,0,test,t1,id: 2,MyISAM,0,test,t2,id: 2
-RENAME,MyISAM,0,test,t2,id: 2,MyISAM,0,test,t1,id: 2
-repair,MyISAM,0,test,t1,id: 2,,0,,,
-optimize,MyISAM,0,test,t1,id: 2,,0,,,
-DROP,MyISAM,0,test,t1,id: 2,,0,,,
 create table t1_innodb (a int) engine=innodb ;
 insert into t1_innodb values (1),(2);
 alter table t1_innodb add column b int;
@@ -44,17 +34,6 @@ test.t1_innodb	optimize	note	Table does not support optimize, doing recreate + a
 test.t1_innodb	optimize	status	OK
 drop table t1_innodb;
 #
-# Reading backup ddl log file
-#
-CREATE,InnoDB,0,test,t1_innodb,id: 1,,0,,,
-ALTER,InnoDB,0,test,t1_innodb,id: 1,InnoDB,0,test,t1_innodb,id: 2
-RENAME,InnoDB,0,test,t1_innodb,id: 2,InnoDB,0,test,t2_innodb,id: 2
-RENAME,InnoDB,0,test,t2_innodb,id: 2,InnoDB,0,test,t1_innodb,id: 2
-TRUNCATE,InnoDB,0,test,t1_innodb,id: 2,,0,,,
-repair,InnoDB,0,test,t1_innodb,id: 2,,0,,,
-ALTER,InnoDB,0,test,t1_innodb,id: 2,InnoDB,0,test,t1_innodb,id: 3
-DROP,InnoDB,0,test,t1_innodb,id: 3,,0,,,
-#
 # Testing with temporary tables (should not be logged)
 #
 create temporary table tmp_t10 (a int) engine=myisam;
@@ -64,9 +43,6 @@ rename table tmp_t11 to tmp_t10;
 truncate table tmp_t10;
 drop table tmp_t10;
 #
-# Reading backup ddl log file
-#
-#
 # Testing with mix of normal and temporary tables
 #
 create temporary table tmp_t20 (a int);
@@ -81,13 +57,6 @@ drop table if exists tmp_t21,t21;
 Warnings:
 Note	1051	Unknown table 'test.tmp_t21'
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t20,id: 1,,0,,,
-DROP,MyISAM,0,test,t20,id: 1,,0,,,
-CREATE,MyISAM,0,test,t21,id: 2,,0,,,
-DROP,MyISAM,0,test,t21,id: 2,,0,,,
-#
 # Testing create select
 #
 create table t30 (a int) ;
@@ -100,18 +69,7 @@ ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 create table t32 (a int) ;
 drop table if exists t30,t31,t32,tmp_t30;
 Warnings:
-Note	1051	Unknown table 'test.tmp_t30'
-#
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t30,id: 1,,0,,,
-CREATE,MyISAM,0,test,t31,id: 2,,0,,,
-DROP,MyISAM,0,test,t31,id: 2,,0,,,
-CREATE,MyISAM,0,test,t31,id: 3,,0,,,
-CREATE,MyISAM,0,test,t32,id: 4,,0,,,
-DROP,MyISAM,0,test,t30,id: 1,,0,,,
-DROP,MyISAM,0,test,t31,id: 3,,0,,,
-DROP,MyISAM,0,test,t32,id: 4,,0,,,
+Note	1051	Unknown table 'test.t31,test.tmp_t30'
 #
 # Testing create LIKE
 #
@@ -128,17 +86,6 @@ t42	CREATE TABLE `t42` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t40, t41, t42;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t40,id: 1,,0,,,
-CREATE,InnoDB,0,test,t41,id: 2,,0,,,
-CREATE,MyISAM,0,test,t42,id: 3,,0,,,
-DROP,MyISAM,0,test,t42,id: 3,,0,,,
-CREATE,InnoDB,0,test,t42,id: 4,,0,,,
-DROP,MyISAM,0,test,t40,id: 1,,0,,,
-DROP,InnoDB,0,test,t41,id: 2,,0,,,
-DROP,InnoDB,0,test,t42,id: 4,,0,,,
-#
 # Testing rename
 #
 create table t50 (a int) ;
@@ -147,18 +94,6 @@ rename table t50 to t52, t51 to t53;
 rename table t52 to tmp, t53 to t52, tmp to t53;
 drop table t52,t53;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t50,id: 1,,0,,,
-CREATE,MyISAM,0,test,t51,id: 2,,0,,,
-RENAME,MyISAM,0,test,t50,id: 1,MyISAM,0,test,t52,id: 1
-RENAME,MyISAM,0,test,t51,id: 2,MyISAM,0,test,t53,id: 2
-RENAME,MyISAM,0,test,t52,id: 1,MyISAM,0,test,tmp,id: 1
-RENAME,MyISAM,0,test,t53,id: 2,MyISAM,0,test,t52,id: 2
-RENAME,MyISAM,0,test,tmp,id: 1,MyISAM,0,test,t53,id: 1
-DROP,MyISAM,0,test,t52,id: 2,,0,,,
-DROP,MyISAM,0,test,t53,id: 1,,0,,,
-#
 # Testing enable/disable keys
 #
 CREATE TABLE t60 (a int(10), index(a) ) ENGINE=Aria ;
@@ -172,13 +107,6 @@ INSERT INTO t61 VALUES(1),(2),(3);
 ALTER TABLE t61 DISABLE KEYS;
 DROP TABLE t61;
 #
-# Reading backup ddl log file
-#
-CREATE,Aria,0,test,t60,id: 1,,0,,,
-CHANGE_INDEX,Aria,0,test,t60,id: 1,,0,,,
-CHANGE_INDEX,Aria,0,test,t60,id: 1,,0,,,
-DROP,Aria,0,test,t60,id: 1,,0,,,
-#
 # Testing load data
 #
 create table t70 (a date, b date, c date not null, d date) engine=aria ;
@@ -195,26 +123,11 @@ insert into t71 select * from t70;
 unlock tables;
 drop table t70,t71;
 #
-# Reading backup ddl log file
-#
-CREATE,Aria,0,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,0,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,0,test,t70,id: 1,,0,,,
-CREATE,Aria,0,test,t71,id: 2,,0,,,
-BULK_INSERT,Aria,0,test,t71,id: 2,,0,,,
-DROP,Aria,0,test,t70,id: 1,,0,,,
-DROP,Aria,0,test,t71,id: 2,,0,,,
-#
 # Testing strange table names
 #
 create table `t 1` (a int) ;
 drop table `t 1`;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t@00201,id: 1,,0,,,
-DROP,MyISAM,0,test,t@00201,id: 1,,0,,,
-#
 # Testing views and triggers
 #
 create table t80 (a int, b int) engine=myisam ;
@@ -224,27 +137,12 @@ drop trigger trg;
 drop view v1;
 drop table t80;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t80,id: 1,,0,,,
-CREATE,VIEW,0,test,v1,,,0,,,
-CREATE,TRIGGER,0,test,trg,,,0,,,
-DROP,TRIGGER,0,test,trg,,,0,,,
-DROP,VIEW,0,test,v1,,,0,,,
-DROP,MyISAM,0,test,t80,id: 1,,0,,,
-#
 # Testing alter to a new storage engine
 #
 create table t85 (a int primary key, b int) engine=myisam ;
 alter table t85 engine=innodb;
 drop table t85;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,0,test,t85,id: 1,,0,,,
-ALTER,MyISAM,0,test,t85,id: 1,InnoDB,0,test,t85,id: 2
-DROP,InnoDB,0,test,t85,id: 2,,0,,,
-#
 # Testing create/drop/alter database
 #
 create database mysqltest;
@@ -253,16 +151,6 @@ create table mysqltest.t91 (a int primary key, b int) engine=innodb;
 alter database mysqltest character set utf8;
 drop database mysqltest;
 #
-# Reading backup ddl log file
-#
-CREATE,DATABASE,0,mysqltest,,,,0,,,
-CREATE,MyISAM,0,mysqltest,t90,id: 1,,0,,,
-CREATE,InnoDB,0,mysqltest,t91,id: 2,,0,,,
-ALTER,DATABASE,0,mysqltest,,,,0,,,
-DROP,MyISAM,0,mysqltest,t90,id: 1,,0,,,
-DROP,InnoDB,0,mysqltest,t91,id: 2,,0,,,
-DROP,DATABASE,0,mysqltest,,,,0,,,
-#
 # MENT-222 bug testing
 #
 CREATE TABLE IF NOT EXISTS t_exists LIKE t_exists_template;
@@ -271,14 +159,83 @@ Note	1050	Table 't_exists' already exists
 #
 # Reading backup ddl log file
 #
+CREATE,MyISAM,0,test,t1,id: 1,,0,,,
+ALTER,MyISAM,0,test,t1,id: 1,MyISAM,0,test,t1,id: 2
+RENAME,MyISAM,0,test,t1,id: 2,MyISAM,0,test,t2,id: 2
+RENAME,MyISAM,0,test,t2,id: 2,MyISAM,0,test,t1,id: 2
+repair,MyISAM,0,test,t1,id: 2,,0,,,
+optimize,MyISAM,0,test,t1,id: 2,,0,,,
+DROP,MyISAM,0,test,t1,id: 2,,0,,,
+CREATE,InnoDB,0,test,t1_innodb,id: 3,,0,,,
+ALTER,InnoDB,0,test,t1_innodb,id: 3,InnoDB,0,test,t1_innodb,id: 4
+RENAME,InnoDB,0,test,t1_innodb,id: 4,InnoDB,0,test,t2_innodb,id: 4
+RENAME,InnoDB,0,test,t2_innodb,id: 4,InnoDB,0,test,t1_innodb,id: 4
+TRUNCATE,InnoDB,0,test,t1_innodb,id: 4,,0,,,
+repair,InnoDB,0,test,t1_innodb,id: 4,,0,,,
+ALTER,InnoDB,0,test,t1_innodb,id: 4,InnoDB,0,test,t1_innodb,id: 5
+DROP,InnoDB,0,test,t1_innodb,id: 5,,0,,,
+CREATE,MyISAM,0,test,t20,id: 6,,0,,,
+DROP,MyISAM,0,test,t20,id: 6,,0,,,
+CREATE,MyISAM,0,test,t21,id: 7,,0,,,
+DROP,MyISAM,0,test,t21,id: 7,,0,,,
+CREATE,MyISAM,0,test,t30,id: 8,,0,,,
+CREATE,MyISAM,0,test,t31,id: 9,,0,,,
+DROP,MyISAM,0,test,t31,id: 9,,0,,,
+CREATE,MyISAM,0,test,t31,id: 10,,0,,,
+DROP,MyISAM,0,test,t31,id: 10,,0,,,
+DROP_AFTER_CREATE,MyISAM,0,test,t31,id: 11,,0,,,
+CREATE,MyISAM,0,test,t32,id: 12,,0,,,
+DROP,MyISAM,0,test,t30,id: 8,,0,,,
+DROP,MyISAM,0,test,t32,id: 12,,0,,,
+CREATE,MyISAM,0,test,t40,id: 13,,0,,,
+CREATE,InnoDB,0,test,t41,id: 14,,0,,,
+CREATE,MyISAM,0,test,t42,id: 15,,0,,,
+DROP,MyISAM,0,test,t42,id: 15,,0,,,
+CREATE,InnoDB,0,test,t42,id: 16,,0,,,
+DROP,MyISAM,0,test,t40,id: 13,,0,,,
+DROP,InnoDB,0,test,t41,id: 14,,0,,,
+DROP,InnoDB,0,test,t42,id: 16,,0,,,
+CREATE,MyISAM,0,test,t50,id: 17,,0,,,
+CREATE,MyISAM,0,test,t51,id: 18,,0,,,
+RENAME,MyISAM,0,test,t50,id: 17,MyISAM,0,test,t52,id: 17
+RENAME,MyISAM,0,test,t51,id: 18,MyISAM,0,test,t53,id: 18
+RENAME,MyISAM,0,test,t52,id: 17,MyISAM,0,test,tmp,id: 17
+RENAME,MyISAM,0,test,t53,id: 18,MyISAM,0,test,t52,id: 18
+RENAME,MyISAM,0,test,tmp,id: 17,MyISAM,0,test,t53,id: 17
+DROP,MyISAM,0,test,t52,id: 18,,0,,,
+DROP,MyISAM,0,test,t53,id: 17,,0,,,
+CREATE,Aria,0,test,t60,id: 19,,0,,,
+CHANGE_INDEX,Aria,0,test,t60,id: 19,,0,,,
+CHANGE_INDEX,Aria,0,test,t60,id: 19,,0,,,
+DROP,Aria,0,test,t60,id: 19,,0,,,
+CREATE,Aria,0,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,0,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,0,test,t70,id: 20,,0,,,
+CREATE,Aria,0,test,t71,id: 21,,0,,,
+BULK_INSERT,Aria,0,test,t71,id: 21,,0,,,
+DROP,Aria,0,test,t70,id: 20,,0,,,
+DROP,Aria,0,test,t71,id: 21,,0,,,
+CREATE,MyISAM,0,test,t@00201,id: 22,,0,,,
+DROP,MyISAM,0,test,t@00201,id: 22,,0,,,
+CREATE,MyISAM,0,test,t80,id: 23,,0,,,
+CREATE,VIEW,0,test,v1,,,0,,,
+CREATE,TRIGGER,0,test,trg,,,0,,,
+DROP,TRIGGER,0,test,trg,,,0,,,
+DROP,VIEW,0,test,v1,,,0,,,
+DROP,MyISAM,0,test,t80,id: 23,,0,,,
+CREATE,MyISAM,0,test,t85,id: 24,,0,,,
+ALTER,MyISAM,0,test,t85,id: 24,InnoDB,0,test,t85,id: 25
+DROP,InnoDB,0,test,t85,id: 25,,0,,,
+CREATE,DATABASE,0,mysqltest,,,,0,,,
+CREATE,MyISAM,0,mysqltest,t90,id: 26,,0,,,
+CREATE,InnoDB,0,mysqltest,t91,id: 27,,0,,,
+ALTER,DATABASE,0,mysqltest,,,,0,,,
+DROP,MyISAM,0,mysqltest,t90,id: 26,,0,,,
+DROP,InnoDB,0,mysqltest,t91,id: 27,,0,,,
+DROP,DATABASE,0,mysqltest,,,,0,,,
 #
 # Cleanup
 #
 DROP TABLE t_exists;
 DROP TABLE t_exists_template;
-#
-# Reading backup ddl log file
-#
-DROP,MyISAM,0,test,t_exists,id: 1,,0,,,
-DROP,MyISAM,0,test,t_exists_template,id: 2,,0,,,
 disconnect con1;
diff --git a/mysql-test/main/backup_log.test b/mysql-test/main/backup_log.test
index d2f5d4616bd..ee34484e92b 100644
--- a/mysql-test/main/backup_log.test
+++ b/mysql-test/main/backup_log.test
@@ -24,8 +24,6 @@ create table mysqltest.t91 (a int primary key, b int) engine=innodb;
 alter database mysqltest character set utf8;
 drop database mysqltest;
 
---source backup_log_print.inc
-
 --echo #
 --echo # MENT-222 bug testing
 --echo #
@@ -38,5 +36,4 @@ CREATE TABLE IF NOT EXISTS t_exists LIKE t_exists_template;
 --echo #
 DROP TABLE t_exists;
 DROP TABLE t_exists_template;
---source backup_log_print.inc
 disconnect con1;
diff --git a/mysql-test/main/backup_log_print.inc b/mysql-test/main/backup_log_print.inc
deleted file mode 100644
index ad46dde49f9..00000000000
--- a/mysql-test/main/backup_log_print.inc
+++ /dev/null
@@ -1,7 +0,0 @@
---disable_query_log
---source include/print_ddl_log.inc
---connection con1
-backup stage end;
-backup stage start;
---connection default
---enable_query_log
diff --git a/mysql-test/main/create_not_windows.result b/mysql-test/main/create_not_windows.result
index 43860c2fdca..8dacf2894eb 100644
--- a/mysql-test/main/create_not_windows.result
+++ b/mysql-test/main/create_not_windows.result
@@ -29,39 +29,3 @@ select count(a) from t1;
 count(a)
 0
 drop table t1;
-#
-# MDEV-25292 Atomic CREATE OR REPLACE TABLE
-#
-# Test multi-byte characters in table name
-set names utf8;
-# Filename is too long because it is converted to @274e@274e@274e@274e...
-# so each '❎' is 5 bytes in filesystem, 51 x 5 = 255 bytes
-create table ❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎ (x int);
-ERROR HY000: Can't create table `test`.`❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎` (errno: 36 "File name too long")
-# Let's find out max length for '❎'...
-# Acceptable name length: 50; Filename length: 254
-# OK with 64-characters table name, filesystem name is 40 x 5 + 24 = 224 bytes
-create table tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎ (x int);
-# Not OK with 65-characters table name
-create table ttttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎ (x int);
-ERROR 42000: Incorrect table name 'ttttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎'
-show tables;
-Tables_in_test
-tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎
-create or replace table tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎ (y int);
-show create table tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎;
-Table	Create Table
-tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎	CREATE TABLE `tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎` (
-  `y` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-set @@debug_dbug="+d,ddl_log_create_after_save_backup", @debug_crash_counter=1;
-create or replace table tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎ (z int);
-ERROR HY000: Lost connection to server during query
-#sql-backup-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.MYD
-#sql-backup-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.MYI
-#sql-backup-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.frm
-#sql-create-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.MYD
-#sql-create-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.MYI
-#sql-create-PID-TID-tttttttttttttttttttttttt@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e.frm
-drop table tttttttttttttttttttttttt❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎;
-set @@debug_dbug="";
diff --git a/mysql-test/main/create_not_windows.test b/mysql-test/main/create_not_windows.test
index d6dfc0d3fa1..b612e31e3aa 100644
--- a/mysql-test/main/create_not_windows.test
+++ b/mysql-test/main/create_not_windows.test
@@ -1,8 +1,6 @@
 # Non-windows specific create tests.
 
 --source include/not_windows.inc
---source include/have_debug.inc
---source include/not_embedded.inc
 
 #
 # Bug#19479:mysqldump creates invalid dump
@@ -43,64 +41,3 @@ create table t1(a int, b int, c int);
 --echo "Try to select from the table. This should not crash the server"
 select count(a) from t1;
 drop table t1;
-
---echo #
---echo # MDEV-25292 Atomic CREATE OR REPLACE TABLE
---echo #
-
-# This does not work on Windows because of max path limit 255
-# (actually it does not work for path 254 already)
-# Note: on Windows use ER_BAD_DB_ERROR instead of ER_CANT_CREATE_TABLE
-# unless MDEV-28746 is fixed.
-
---echo # Test multi-byte characters in table name
-set names utf8;
-let $save_debug=`select @@debug_dbug`;
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
---echo # Filename is too long because it is converted to @274e@274e@274e@274e...
---echo # so each '❎' is 5 bytes in filesystem, 51 x 5 = 255 bytes
-let $t= `select repeat('❎', 51)`;
---error ER_CANT_CREATE_TABLE
-eval create table $t (x int);
-# The below case is useful for experimenting on Windows
---echo # Let's find out max length for '❎'...
---disable_query_log
-let $i= 50;
-while ($i)
-{
-  let $t= `select repeat('❎', $i)`;
-  --error 0,ER_CANT_CREATE_TABLE
-  eval create table $t (x int);
-  let $good_len= $i;
-  dec $i;
-  if (!$mysql_errno)
-  {
-    let $i= 0;
-  }
-}
-let $fn_len= `select $good_len * 5 + 4`; # 4 is extension length
-eval drop table $t;
---enable_query_log
---echo # Acceptable name length: $good_len; Filename length: $fn_len
---echo # OK with 64-characters table name, filesystem name is 40 x 5 + 24 = 224 bytes
-let $t= `select concat(repeat('t', 24), repeat('❎', 40))`;
-eval create table $t (x int);
---echo # Not OK with 65-characters table name
-let $t2= `select concat(repeat('t', 25), repeat('❎', 40))`;
---error ER_WRONG_TABLE_NAME
-eval create table $t2 (x int);
-show tables;
-# Let's try atomic replace with such long name and see what happens
-eval create or replace table $t (y int);
-eval show create table $t;
-set @@debug_dbug="+d,ddl_log_create_after_save_backup", @debug_crash_counter=1;
---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---disable_reconnect
---error 2013
-eval create or replace table $t (z int);
---replace_regex /-\w+-\w+-ttt/-PID-TID-ttt/
---list_files $MYSQLD_DATADIR/test *sql*
---enable_reconnect
---source include/wait_until_connected_again.inc
-eval drop table $t;
-eval set @@debug_dbug="$save_debug";
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result
index be863986f78..4e96af97326 100644
--- a/mysql-test/main/create_or_replace.result
+++ b/mysql-test/main/create_or_replace.result
@@ -1,3 +1,5 @@
+SET @save_persistent=@@GLOBAL.innodb_stats_persistent;
+SET GLOBAL innodb_stats_persistent=OFF;
 CREATE TABLE t2 (a int);
 INSERT INTO t2 VALUES(1),(2),(3);
 #
@@ -258,8 +260,7 @@ Note	1051	Unknown table 'test.t1,mysqltest2.t2'
 create table test.t1 (i int) engine=myisam;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -271,37 +272,24 @@ create or replace table test.t1;
 ERROR 42000: A table must have at least 1 column
 show tables;
 Tables_in_test
-t1
 t2
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 create or replace table mysqltest2.t2;
 ERROR 42000: A table must have at least 1 column
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-drop table mysqltest2.t2;
-drop table t1;
 create table t1 (i int);
 drop table t1;
 create table test.t1 (i int);
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -313,37 +301,24 @@ create or replace table test.t1 (a int) select 1 as 'a', 2 as 'a';
 ERROR 42S21: Duplicate column name 'a'
 show tables;
 Tables_in_test
-t1
 t2
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 create or replace table mysqltest2.t2 (a int) select 1 as 'a', 2 as 'a';
 ERROR 42S21: Duplicate column name 'a'
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
-#	MDL_BACKUP_DDL	NULL	Backup lock		
-#	MDL_BACKUP_DML	NULL	Backup lock		
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
-#	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	test	
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	mysqltest2	t2
-#	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
-drop table mysqltest2.t2;
-drop table t1;
 create table t1 (i int);
 drop table t1;
 create table test.t1 (i int) engine=innodb;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
@@ -355,8 +330,7 @@ drop table test.t1,mysqltest2.t2;
 create table test.t1 (i int) engine=aria transactional=1 checksum=1;
 create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_INTENTION_EXCLUSIVE	NULL	Schema metadata lock	mysqltest2	
@@ -373,8 +347,7 @@ drop table test.t1;
 #
 create table t1 (i int);
 lock table t1 write;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -382,12 +355,10 @@ THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 create or replace table t1 (a char(1)) engine=Innodb select 'foo' as a;
 ERROR 22001: Data too long for column 'a' at row 1
-drop table t1;
 show tables;
 Tables_in_test
 t2
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 create table t1 (i int);
 drop table t1;
@@ -475,8 +446,7 @@ drop view t1;
 #
 create table t1 (a int);
 lock table t1 write, t2 read;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -484,8 +454,7 @@ THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 #	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
 create or replace table t1 (i int);
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -493,8 +462,7 @@ THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 #	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
 create or replace table t1 like t2;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -502,8 +470,7 @@ THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_SHARED_NO_READ_WRITE	NULL	Table metadata lock	test	t1
 #	MDL_SHARED_READ	NULL	Table metadata lock	test	t2
 create or replace table t1 select 1 as f1;
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 THREAD_ID	LOCK_MODE	LOCK_DURATION	LOCK_TYPE	TABLE_SCHEMA	TABLE_NAME
 #	MDL_BACKUP_DDL	NULL	Backup lock		
 #	MDL_BACKUP_DML	NULL	Backup lock		
@@ -612,320 +579,4 @@ DROP TABLE IF EXISTS tm, t;
 #
 # End of 10.3 tests
 #
-# End of 10.4 tests
-#
-# MDEV-25292 Atomic CREATE OR REPLACE TABLE
-#
-create table t1 (a int);
-insert t1 values (1), (1);
-create table t2 (c int);
-create or replace table t2 (a int, b int, key k (a), key k (b));
-ERROR 42000: Duplicate key name 'k'
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-create or replace table t2 (a int, b int, key k (a), key k (b)) as select a, a as b from t1;
-ERROR 42000: Duplicate key name 'k'
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-create or replace table t2 (a int primary key) as select * from t1;
-ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-set @old_mode= @@sql_mode;
-set @@sql_mode='ALLOW_INVALID_DATES';
-create table t3 (dt datetime default '2008-02-31 00:00:00');
-set @@sql_mode= @old_mode;
-create or replace table t2 like t3;
-ERROR 42000: Invalid default value for 'dt'
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `c` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-# LOCK TABLES
-lock tables t2 write, t1 write;
-flush tables;
-show open tables like 't2';
-Database	Table	In_use	Name_locked
-test	t2	1	0
-create or replace table t2 (y int);
-flush tables;
-show open tables like 't2';
-Database	Table	In_use	Name_locked
-test	t2	1	0
-create or replace table t2 like t1;
-flush tables;
-show open tables like 't2';
-Database	Table	In_use	Name_locked
-test	t2	1	0
-create or replace table t2 (y int) as select * from t1;
-flush tables;
-show open tables like 't2';
-Database	Table	In_use	Name_locked
-test	t2	1	0
-unlock tables;
-# SP
-create or replace procedure sp(n int)
-begin
-select concat('sp call ', n, ':') as '';
-show open tables like 't2';
-create or replace table t2 (y int);
-select 'create or replace table t2 (y int);' as '';
-show open tables like 't2';
-insert into t2 values (2);
-select 'insert into t2 values (2);' as '';
-show open tables like 't2';
-create or replace table t2 like t1;
-select 'create or replace table t2 like t1;' as '';
-show open tables like 't2';
-create or replace table t2 (y int) as select * from t1;
-select 'create or replace table t2 (y int) as select * from t1;' as '';
-show open tables like 't2';
-select 'select * from t2;' as '';
-select * from t2;
-show open tables  like 't2';
-end $
-flush tables;
-call sp(1);
-
-sp call 1:
-Database	Table	In_use	Name_locked
-
-create or replace table t2 (y int);
-Database	Table	In_use	Name_locked
-
-insert into t2 values (2);
-Database	Table	In_use	Name_locked
-test	t2	0	0
-
-create or replace table t2 like t1;
-Database	Table	In_use	Name_locked
-
-create or replace table t2 (y int) as select * from t1;
-Database	Table	In_use	Name_locked
-
-select * from t2;
-y	a
-NULL	1
-NULL	1
-Database	Table	In_use	Name_locked
-test	t2	0	0
-call sp(2);
-
-sp call 2:
-Database	Table	In_use	Name_locked
-test	t2	0	0
-
-create or replace table t2 (y int);
-Database	Table	In_use	Name_locked
-
-insert into t2 values (2);
-Database	Table	In_use	Name_locked
-test	t2	0	0
-
-create or replace table t2 like t1;
-Database	Table	In_use	Name_locked
-
-create or replace table t2 (y int) as select * from t1;
-Database	Table	In_use	Name_locked
-
-select * from t2;
-y	a
-NULL	1
-NULL	1
-Database	Table	In_use	Name_locked
-test	t2	0	0
-# SP under LOCK TABLES
-lock tables t2 write, t1 write;
-call sp(3);
-
-sp call 3:
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 (y int);
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-insert into t2 values (2);
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 like t1;
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 (y int) as select * from t1;
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-select * from t2;
-y	a
-NULL	1
-NULL	1
-Database	Table	In_use	Name_locked
-test	t2	1	0
-call sp(4);
-
-sp call 4:
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 (y int);
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-insert into t2 values (2);
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 like t1;
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-create or replace table t2 (y int) as select * from t1;
-Database	Table	In_use	Name_locked
-test	t2	1	0
-
-select * from t2;
-y	a
-NULL	1
-NULL	1
-Database	Table	In_use	Name_locked
-test	t2	1	0
-unlock tables;
-drop procedure sp;
-drop tables t1, t2, t3;
-# Trigger
-create table t1 (a int);
-create trigger a before insert on t1 for each row set @s= 1;
-create or replace table t1 (old int);
-show create trigger a;
-ERROR HY000: Trigger does not exist
-drop table t1;
-# PS: check thd->change_list sanity
-create table t1 (a int not null, b char(10) as (concat('', dayname('2020-02-02'))))  collate utf8_bin;
-prepare stmt from 'insert into t1 (b) values (2)';
-create or replace table t1 (x int);
-drop table t1;
-drop prepare stmt;
-# Foreign keys
-create table t1 (x int primary key, y int) engine innodb;
-create table t2 (x int references t1(x)) engine innodb;
-create or replace table t1 (x int primary key);
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-create or replace table t1 (x int primary key);
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-create table t3 (x int);
-create or replace table t1 like t3;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-create or replace table t1 like t3;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-create or replace table t1 select * from t3;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-create or replace table t1 select * from t3;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (t2)
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `x` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`x`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-drop tables t3, t2, t1;
-# UNIQUE
-create table t1 (pk int auto_increment primary key, a varchar(2300), unique (a)) engine aria;
-insert into t1 (a) values ('a'), ('b'), ('c');
-create table t2 (x int);
-create or replace table t2 engine aria select * from t1;
-select * from t2;
-pk	a
-1	a
-2	b
-3	c
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `pk` int(11) NOT NULL DEFAULT 0,
-  `a` varchar(2300) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
-drop tables t2, t1;
-#
-# MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES
-#
-# Atomic CREATE OR REPLACE part:
-#
-create table t1 (pk int primary key) engine=innodb;
-create or replace table t2 (a int primary key references t1 (pk)) engine=innodb;
-lock tables t1 write, t2 write;
-create or replace table t2 (c1 int not null, c1 varchar(255) ) engine=innodb;
-ERROR 42S21: Duplicate column name 'c1'
-select * from t1;
-pk
-select * from t2;
-a
-unlock tables;
-drop tables t2, t1;
-#
-# MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name
-#
-use test;
-create table t (a int primary key) engine=innodb;
-create or replace table u (
-a int primary key,
-constraint c foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/c	test/u	test/t	1	0
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/c	a	a	0
-create or replace table u (
-a int primary key,
-constraint c foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/c	test/u	test/t	1	0
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/c	a	a	0
-drop tables u, t;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-#
-# MDEV-29544 SIGSEGV in HA_CREATE_INFO::finalize_locked_tables
-#
-call mtr.add_suppression("mysql.innodb_index_stats");
-set sql_mode= '';
-create table t (x int) engine innodb;
-insert into t values (77);
-alter table mysql.innodb_index_stats modify stat_description char(10);
-Warnings:
-Warning	1265	Data truncated for column 'stat_description' at row 2
-Warning	1265	Data truncated for column 'stat_description' at row 3
-lock table t write;
-create or replace table t (y int);
-ERROR HY000: Error on rename of './test/t' to './test/#sql-backup-t' (errno: 168 "Unknown (generic) error from engine")
-unlock tables;
-alter table mysql.innodb_index_stats modify stat_description varchar(1024) not null;
-select * from t;
-x
-77
-drop table t;
-set sql_mode= default;
-#
-# MDEV-29620 Assertion `next_insert_id == 0' failed in handler::ha_external_lock
-#
-create or replace table t1 (i serial) as select * from (values(1), (2)) dt;
-drop table t1;
+SET GLOBAL innodb_stats_persistent=@save_persistent;
diff --git a/mysql-test/main/create_or_replace.test b/mysql-test/main/create_or_replace.test
index 3622d8342f4..05c5d25ba15 100644
--- a/mysql-test/main/create_or_replace.test
+++ b/mysql-test/main/create_or_replace.test
@@ -5,7 +5,8 @@
 --source include/have_innodb.inc
 --source include/have_metadata_lock_info.inc
 
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
+SET @save_persistent=@@GLOBAL.innodb_stats_persistent;
+SET GLOBAL innodb_stats_persistent=OFF;
 
 #
 # Create help table
@@ -217,23 +218,18 @@ create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 --error ER_TABLE_MUST_HAVE_COLUMNS
 create or replace table test.t1;
 show tables;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 --error ER_TABLE_MUST_HAVE_COLUMNS
 create or replace table mysqltest2.t2;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
-drop table mysqltest2.t2;
-drop table t1;
+select * from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 
@@ -242,23 +238,18 @@ create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 --error ER_DUP_FIELDNAME
 create or replace table test.t1 (a int) select 1 as 'a', 2 as 'a';
 show tables;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 --error ER_DUP_FIELDNAME
 create or replace table mysqltest2.t2 (a int) select 1 as 'a', 2 as 'a';
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
-drop table mysqltest2.t2;
-drop table t1;
+select * from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 
@@ -267,8 +258,7 @@ create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 unlock tables;
 drop table test.t1,mysqltest2.t2;
 
@@ -277,8 +267,7 @@ create table mysqltest2.t2 like test.t1;
 lock table test.t1 write, mysqltest2.t2 write;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 unlock tables;
 drop table t1;
 
@@ -294,16 +283,13 @@ create table t1 (i int);
 lock table t1 write;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 --error ER_DATA_TOO_LONG
 create or replace table t1 (a char(1)) engine=Innodb select 'foo' as a;
-drop table t1;
 show tables;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 create table t1 (i int);
 drop table t1;
 --enable_view_protocol
@@ -381,24 +367,20 @@ create table t1 (a int);
 lock table t1 write, t2 read;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 
 create or replace table t1 (i int);
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 create or replace table t1 like t2;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 create or replace table t1 select 1 as f1;
 --replace_column 1 #
 --sorted_result
-select * from information_schema.metadata_lock_info
-where table_schema!='mysql' or table_name not like 'innodb_%_stats';
+select * from information_schema.metadata_lock_info;
 drop table t1;
 unlock tables;
 
@@ -546,182 +528,4 @@ DROP TABLE IF EXISTS tm, t;
 --echo # End of 10.3 tests
 --echo #
 
---echo # End of 10.4 tests
-
---echo #
---echo # MDEV-25292 Atomic CREATE OR REPLACE TABLE
---echo #
-create table t1 (a int);
-insert t1 values (1), (1);
-create table t2 (c int);
---error ER_DUP_KEYNAME
-create or replace table t2 (a int, b int, key k (a), key k (b));
-show create table t2;
---error ER_DUP_KEYNAME
-create or replace table t2 (a int, b int, key k (a), key k (b)) as select a, a as b from t1;
-show create table t2;
---error ER_DUP_ENTRY
-create or replace table t2 (a int primary key) as select * from t1;
-show create table t2;
-set @old_mode= @@sql_mode;
-set @@sql_mode='ALLOW_INVALID_DATES';
-create table t3 (dt datetime default '2008-02-31 00:00:00');
-set @@sql_mode= @old_mode;
---error ER_INVALID_DEFAULT
-create or replace table t2 like t3;
-show create table t2;
---echo # LOCK TABLES
-lock tables t2 write, t1 write;
-flush tables;
-show open tables like 't2';
-create or replace table t2 (y int);
-flush tables;
-show open tables like 't2';
-create or replace table t2 like t1;
-flush tables;
-show open tables like 't2';
-create or replace table t2 (y int) as select * from t1;
-flush tables;
-show open tables like 't2';
-unlock tables;
---echo # SP
---delimiter $
-create or replace procedure sp(n int)
-begin
-  select concat('sp call ', n, ':') as '';
-  show open tables like 't2';
-  create or replace table t2 (y int);
-  select 'create or replace table t2 (y int);' as '';
-  show open tables like 't2';
-  insert into t2 values (2);
-  select 'insert into t2 values (2);' as '';
-  show open tables like 't2';
-  create or replace table t2 like t1;
-  select 'create or replace table t2 like t1;' as '';
-  show open tables like 't2';
-  create or replace table t2 (y int) as select * from t1;
-  select 'create or replace table t2 (y int) as select * from t1;' as '';
-  show open tables like 't2';
-  select 'select * from t2;' as '';
-  select * from t2;
-  show open tables  like 't2';
-end $
---delimiter ;
-flush tables;
-call sp(1); call sp(2);
---echo # SP under LOCK TABLES
-lock tables t2 write, t1 write;
-call sp(3); call sp(4);
-unlock tables;
-drop procedure sp;
-drop tables t1, t2, t3;
---echo # Trigger
-create table t1 (a int);
-create trigger a before insert on t1 for each row set @s= 1;
-create or replace table t1 (old int);
---error ER_TRG_DOES_NOT_EXIST
-show create trigger a;
-drop table t1;
---echo # PS: check thd->change_list sanity
-create table t1 (a int not null, b char(10) as (concat('', dayname('2020-02-02'))))  collate utf8_bin;
-prepare stmt from 'insert into t1 (b) values (2)';
-create or replace table t1 (x int);
-drop table t1;
-drop prepare stmt;
---echo # Foreign keys
---list_files $MYSQLD_DATADIR/test *sql*
-create table t1 (x int primary key, y int) engine innodb;
-create table t2 (x int references t1(x)) engine innodb;
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 (x int primary key);
---list_files $MYSQLD_DATADIR/test *sql*
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 (x int primary key);
-create table t3 (x int);
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 like t3;
---list_files $MYSQLD_DATADIR/test *sql*
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 like t3;
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 select * from t3;
---error ER_ROW_IS_REFERENCED_2
-create or replace table t1 select * from t3;
---list_files $MYSQLD_DATADIR/test *sql*
-show create table t1;
-drop tables t3, t2, t1;
---echo # UNIQUE
-create table t1 (pk int auto_increment primary key, a varchar(2300), unique (a)) engine aria;
-insert into t1 (a) values ('a'), ('b'), ('c');
-create table t2 (x int);
-create or replace table t2 engine aria select * from t1;
-select * from t2;
-show create table t2;
-drop tables t2, t1;
-
---echo #
---echo # MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES
---echo #
---echo # Atomic CREATE OR REPLACE part:
---echo #
---disable_service_connection
-create table t1 (pk int primary key) engine=innodb;
-create or replace table t2 (a int primary key references t1 (pk)) engine=innodb;
-
-lock tables t1 write, t2 write;
---error ER_DUP_FIELDNAME
-create or replace table t2 (c1 int not null, c1 varchar(255) ) engine=innodb;
-select * from t1;
-select * from t2;
-unlock tables;
-
-drop tables t2, t1;
---enable_service_connection
-
---echo #
---echo # MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name
---echo #
-use test;
-create table t (a int primary key) engine=innodb;
-create or replace table u (
-  a int primary key,
-  constraint c foreign key d (a) references t (a)) engine=innodb;
-
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-
-create or replace table u (
-  a int primary key,
-  constraint c foreign key d (a) references t (a)) engine=innodb;
-
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-drop tables u, t;
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-
---echo #
---echo # MDEV-29544 SIGSEGV in HA_CREATE_INFO::finalize_locked_tables
---echo #
-call mtr.add_suppression("mysql.innodb_index_stats");
-set sql_mode= '';
-create table t (x int) engine innodb;
-insert into t values (77);
-alter table mysql.innodb_index_stats modify stat_description char(10);
-lock table t write;
---replace_regex /#sql-backup-.+-.+-/#sql-backup-/
---replace_result $MYSQLD_DATADIR ./
---error ER_ERROR_ON_RENAME
-create or replace table t (y int);
-# cleanup
-unlock tables;
-alter table mysql.innodb_index_stats modify stat_description varchar(1024) not null;
-select * from t;
-drop table t;
-set sql_mode= default;
-
---echo #
---echo # MDEV-29620 Assertion `next_insert_id == 0' failed in handler::ha_external_lock
---echo #
-create or replace table t1 (i serial) as select * from (values(1), (2)) dt;
-drop table t1;
+SET GLOBAL innodb_stats_persistent=@save_persistent;
diff --git a/mysql-test/main/create_or_replace2.result b/mysql-test/main/create_or_replace2.result
new file mode 100644
index 00000000000..c84d54004ca
--- /dev/null
+++ b/mysql-test/main/create_or_replace2.result
@@ -0,0 +1,27 @@
+include/master-slave.inc
+[connection master]
+drop table if exists t1;
+SET @old_debug= @@session.debug;
+CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB;
+CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam;
+SET debug_dbug='+d,send_kill_after_delete';
+CREATE OR REPLACE TABLE t1 LIKE tmp;
+SET debug_dbug=@old_debug;
+SHOW TABLES;
+Tables_in_test
+t1
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL,
+  KEY `a` (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+connection slave;
+SHOW TABLES;
+Tables_in_test
+t1
+connection master;
+drop temporary table if exists tmp;
+drop table t1;
+include/rpl_end.inc
diff --git a/mysql-test/main/create_or_replace2.test b/mysql-test/main/create_or_replace2.test
new file mode 100644
index 00000000000..80c8b635d8d
--- /dev/null
+++ b/mysql-test/main/create_or_replace2.test
@@ -0,0 +1,35 @@
+#
+# Check CREATE OR REPLACE TABLE for test that requires DEBUG
+#
+
+--source include/have_debug.inc
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+--source include/master-slave.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+SET @old_debug= @@session.debug;
+
+#
+# MDEV-5854
+# Interrupted CREATE OR REPLACE is written into binlog, and in a wrong format
+#
+
+CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB;
+CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam;
+SET debug_dbug='+d,send_kill_after_delete';
+CREATE OR REPLACE TABLE t1 LIKE tmp;
+SET debug_dbug=@old_debug;
+SHOW TABLES;
+show create table t1;
+--sync_slave_with_master
+SHOW TABLES;
+--connection master
+
+--disable_warnings
+drop temporary table if exists tmp;
+--enable_warnings
+drop table t1;
+--source include/rpl_end.inc
diff --git a/mysql-test/main/create_replace_debug.result b/mysql-test/main/create_replace_debug.result
deleted file mode 100644
index 3a3ef21bdec..00000000000
--- a/mysql-test/main/create_replace_debug.result
+++ /dev/null
@@ -1,103 +0,0 @@
-include/master-slave.inc
-[connection master]
-drop table if exists t1;
-SET @old_debug= @@session.debug;
-CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB;
-CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam;
-SET debug_dbug='+d,send_kill_after_delete';
-CREATE OR REPLACE TABLE t1 LIKE tmp;
-SET debug_dbug=@old_debug;
-SHOW TABLES;
-Tables_in_test
-t1
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL,
-  KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-connection slave;
-SHOW TABLES;
-Tables_in_test
-t1
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL,
-  KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-connection master;
-drop temporary table if exists tmp;
-drop table t1;
-include/rpl_end.inc
-#
-# MDEV-25292 Atomic CREATE OR REPLACE TABLE
-#
-set @saved_debug_dbug= @@session.debug_dbug;
-create table t1 (a int primary key) engine innodb;
-insert t1 values (1), (2);
-create table t2 (c int, a int constraint t1_a references t1 (a)) engine innodb;
-insert into t2 values (2, 2);
-lock tables t2 write, t1 write;
-set session debug_dbug= '+d,atomic_replace_external_lock_fail';
-create or replace table t2 (y int) as select * from t1;
-ERROR HY000: The total number of locks exceeds the lock table size
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) NOT NULL,
-  PRIMARY KEY (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `c` int(11) DEFAULT NULL,
-  `a` int(11) DEFAULT NULL,
-  KEY `t1_a` (`a`),
-  CONSTRAINT `t1_a` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-select * from t2;
-c	a
-2	2
-unlock tables;
-drop tables t2, t1;
-set session debug_dbug= @saved_debug_dbug;
-# Test entry_pos in higher position, so drop chain executes before create chain
-# (see commit message: On linking two chains together)
-create table t1 (c int);
-create or replace table t1 (a int, b int, key k (a), key k (b));
-ERROR 42000: Duplicate key name 'k'
-create or replace table t1 (a int, b int, key k (a), key k (b));
-ERROR 42000: Duplicate key name 'k'
-drop table t1;
-#
-# MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES
-#
-# Non-atomic CREATE OR REPLACE part:
-#
-set @saved_debug_dbug= @@session.debug_dbug;
-set @@debug_dbug="+d,ddl_log_expensive_rename";
-create table t1 (pk int primary key) engine=innodb;
-create or replace table t2 (a int primary key references t1 (pk)) engine=innodb;
-lock tables t1 write, t2 write;
-create or replace table t2 (c1 int not null, c1 varchar(255) ) engine=innodb;
-ERROR 42S21: Duplicate column name 'c1'
-select * from t1;
-pk
-select * from t2;
-ERROR HY000: Table 't2' was not locked with LOCK TABLES
-unlock tables;
-drop tables t1;
-set @@debug_dbug= @saved_debug_dbug;
-#
-# MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection
-#
-create table t1 (x int);
-set @old_dbug= @@debug_dbug;
-set @@debug_dbug= '+d,ha_end_bulk_insert_fail';
-create or replace table t2 (y int) engine innodb select * from t1;
-ERROR HY000: Out of memory.
-set @@debug_dbug= @old_dbug;
-drop table t1;
diff --git a/mysql-test/main/create_replace_debug.test b/mysql-test/main/create_replace_debug.test
deleted file mode 100644
index 86e68c47743..00000000000
--- a/mysql-test/main/create_replace_debug.test
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Check CREATE OR REPLACE TABLE for test that requires DEBUG
-#
-
---source include/have_debug.inc
---source include/have_binlog_format_row.inc
---source include/have_innodb.inc
---source include/master-slave.inc
-
---disable_warnings
-drop table if exists t1;
---enable_warnings
-SET @old_debug= @@session.debug;
-
-#
-# MDEV-5854
-# Interrupted CREATE OR REPLACE is written into binlog, and in a wrong format
-#
-
-CREATE TABLE t1 (i INT, KEY(i)) ENGINE=InnoDB;
-CREATE OR REPLACE TEMPORARY TABLE tmp (a int, b int, key(a)) engine=myisam;
-SET debug_dbug='+d,send_kill_after_delete';
-CREATE OR REPLACE TABLE t1 LIKE tmp;
-SET debug_dbug=@old_debug;
-SHOW TABLES;
-show create table t1;
---sync_slave_with_master
-SHOW TABLES;
-show create table t1;
---connection master
-
---disable_warnings
-drop temporary table if exists tmp;
---enable_warnings
-drop table t1;
---source include/rpl_end.inc
-
-
---echo #
---echo # MDEV-25292 Atomic CREATE OR REPLACE TABLE
---echo #
-set @saved_debug_dbug= @@session.debug_dbug;
-create table t1 (a int primary key) engine innodb;
-insert t1 values (1), (2);
-create table t2 (c int, a int constraint t1_a references t1 (a)) engine innodb;
-insert into t2 values (2, 2);
-lock tables t2 write, t1 write;
-set session debug_dbug= '+d,atomic_replace_external_lock_fail';
---error ER_LOCK_TABLE_FULL
-create or replace table t2 (y int) as select * from t1;
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
---list_files $MYSQLD_DATADIR/test *sql*
-show create table t1;
-show create table t2;
-select * from t2;
-unlock tables;
-drop tables t2, t1;
-set session debug_dbug= @saved_debug_dbug;
-
---echo # Test entry_pos in higher position, so drop chain executes before create chain
---echo # (see commit message: On linking two chains together)
-create table t1 (c int);
---error ER_DUP_KEYNAME
-create or replace table t1 (a int, b int, key k (a), key k (b));
---error ER_DUP_KEYNAME
-create or replace table t1 (a int, b int, key k (a), key k (b));
-drop table t1;
-
---echo #
---echo # MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES
---echo #
---echo # Non-atomic CREATE OR REPLACE part:
---echo #
-set @saved_debug_dbug= @@session.debug_dbug;
-set @@debug_dbug="+d,ddl_log_expensive_rename";
-create table t1 (pk int primary key) engine=innodb;
-create or replace table t2 (a int primary key references t1 (pk)) engine=innodb;
-
-lock tables t1 write, t2 write;
---error ER_DUP_FIELDNAME
-create or replace table t2 (c1 int not null, c1 varchar(255) ) engine=innodb;
-select * from t1;
---error ER_TABLE_NOT_LOCKED
-select * from t2;
-unlock tables;
-
-drop tables t1;
-set @@debug_dbug= @saved_debug_dbug;
-
---echo #
---echo # MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection
---echo #
-create table t1 (x int);
-set @old_dbug= @@debug_dbug;
-set @@debug_dbug= '+d,ha_end_bulk_insert_fail';
---error ER_OUT_OF_RESOURCES
-create or replace table t2 (y int) engine innodb select * from t1;
-set @@debug_dbug= @old_dbug;
-drop table t1;
diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result
index 874f3af25e0..abcf3b27c9c 100644
--- a/mysql-test/main/default.result
+++ b/mysql-test/main/default.result
@@ -428,6 +428,14 @@ a	b	c	e
 2	-1	1	1
 drop table t1;
 #
+# Create or replace can delete a table on error
+#
+create table t1 (a int);
+create or replace table t1 (a int default b, b int default a);
+ERROR 01000: Expression for field `a` is referring to uninitialized field `b`
+show create table t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+#
 # Refering to other columns
 #
 create or replace table t1 (a int default 1, b int default a);
@@ -445,11 +453,11 @@ ERROR 01000: Expression for field `a` is referring to uninitialized field `a`
 create or replace table t1 (a int default b, b int default (1+1));
 create or replace table t1 (a int default 1, b int as (c), c int as (a+1));
 ERROR 01000: Expression for field `b` is referring to uninitialized field `c`
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT (DEFAULT(a)));
+CREATE TABLE t1 (a INT DEFAULT (DEFAULT(a)));
 ERROR 01000: Expression for field `a` is referring to uninitialized field `a`
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT(DEFAULT(b)), b INT DEFAULT(DEFAULT(a)));
+CREATE TABLE t1 (a INT DEFAULT(DEFAULT(b)), b INT DEFAULT(DEFAULT(a)));
 ERROR 01000: Expression for field `a` is referring to uninitialized field `b`
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT(DEFAULT(b)) NOT NULL, b INT DEFAULT(DEFAULT(a)) NOT NULL);
+CREATE TABLE t1 (a INT DEFAULT(DEFAULT(b)) NOT NULL, b INT DEFAULT(DEFAULT(a)) NOT NULL);
 ERROR 01000: Expression for field `a` is referring to uninitialized field `b`
 #
 # Allow defaults to refer to not default fields
diff --git a/mysql-test/main/default.test b/mysql-test/main/default.test
index 36a616551d7..26fc2186533 100644
--- a/mysql-test/main/default.test
+++ b/mysql-test/main/default.test
@@ -308,6 +308,15 @@ select * from t1;
 drop table t1;
 
 --echo #
+--echo # Create or replace can delete a table on error
+--echo #
+create table t1 (a int);
+--error ER_EXPRESSION_REFERS_TO_UNINIT_FIELD
+create or replace table t1 (a int default b, b int default a);
+--error ER_NO_SUCH_TABLE
+show create table t1;
+
+--echo #
 --echo # Refering to other columns
 --echo #
 
@@ -329,11 +338,11 @@ create or replace table t1 (a int default b, b int default (1+1));
 --error ER_EXPRESSION_REFERS_TO_UNINIT_FIELD
 create or replace table t1 (a int default 1, b int as (c), c int as (a+1));
 --error ER_EXPRESSION_REFERS_TO_UNINIT_FIELD
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT (DEFAULT(a)));
+CREATE TABLE t1 (a INT DEFAULT (DEFAULT(a)));
 --error ER_EXPRESSION_REFERS_TO_UNINIT_FIELD
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT(DEFAULT(b)), b INT DEFAULT(DEFAULT(a)));
+CREATE TABLE t1 (a INT DEFAULT(DEFAULT(b)), b INT DEFAULT(DEFAULT(a)));
 --error ER_EXPRESSION_REFERS_TO_UNINIT_FIELD
-CREATE OR REPLACE TABLE t1 (a INT DEFAULT(DEFAULT(b)) NOT NULL, b INT DEFAULT(DEFAULT(a)) NOT NULL);
+CREATE TABLE t1 (a INT DEFAULT(DEFAULT(b)) NOT NULL, b INT DEFAULT(DEFAULT(a)) NOT NULL);
 
 --echo #
 --echo # Allow defaults to refer to not default fields
diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result
index b0d64c1f284..31fa5f8c8d5 100644
--- a/mysql-test/main/long_unique_bugs.result
+++ b/mysql-test/main/long_unique_bugs.result
@@ -397,8 +397,7 @@ c	d
 create or replace table t2 (a int, b blob, unique(b)) as select * from t1;
 ERROR 23000: Duplicate entry 'bar' for key 'b'
 select * from t2;
-c	d
-3	bar
+ERROR 42S02: Table 'test.t2' doesn't exist
 create or replace table t2 (a int, b blob, unique(b)) ignore as select * from t1;
 Warnings:
 Warning	1062	Duplicate entry 'bar' for key 'b'
diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test
index e522f5140ba..18e430858b0 100644
--- a/mysql-test/main/long_unique_bugs.test
+++ b/mysql-test/main/long_unique_bugs.test
@@ -480,6 +480,7 @@ delete from t2 using t1, t2 where t1.a=t2.c and t1.b='foo';
 # CREATE...SELECT
 --error ER_DUP_ENTRY
 create or replace table t2 (a int, b blob, unique(b)) as select * from t1;
+--error ER_NO_SUCH_TABLE
   select * from t2;
 create or replace table t2 (a int, b blob, unique(b)) ignore as select * from t1;
   select * from t2;
diff --git a/mysql-test/suite/atomic/create_replace,aria_notrans,row.result b/mysql-test/suite/atomic/create_replace,aria_notrans,row.result
deleted file mode 100644
index c8df035b23a..00000000000
--- a/mysql-test/suite/atomic/create_replace,aria_notrans,row.result
+++ /dev/null
@@ -1,710 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=Aria PAGE_CHECKSUM=1 TRANSACTIONAL=0
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=Aria PAGE_CHECKSUM=1 TRANSACTIONAL=0
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=Aria PAGE_CHECKSUM=1 TRANSACTIONAL=0
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=Aria PAGE_CHECKSUM=1 TRANSACTIONAL=0
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,aria_notrans.result b/mysql-test/suite/atomic/create_replace,aria_notrans.result
deleted file mode 100644
index 7a3e47f1312..00000000000
--- a/mysql-test/suite/atomic/create_replace,aria_notrans.result
+++ /dev/null
@@ -1,696 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int) engine=aria,transactional=0
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 engine=aria,transactional=0 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,expensive_rename,row.result b/mysql-test/suite/atomic/create_replace,expensive_rename,row.result
deleted file mode 100644
index 5095b1fea03..00000000000
--- a/mysql-test/suite/atomic/create_replace,expensive_rename,row.result
+++ /dev/null
@@ -1,584 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,expensive_rename.result b/mysql-test/suite/atomic/create_replace,expensive_rename.result
deleted file mode 100644
index 41405a2c217..00000000000
--- a/mysql-test/suite/atomic/create_replace,expensive_rename.result
+++ /dev/null
@@ -1,561 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_frm
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_create_table
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_drop
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_install_new
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_before_binlog
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_prepare_eof
-master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by ddl recovery */
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,ib,row.result b/mysql-test/suite/atomic/create_replace,ib,row.result
deleted file mode 100644
index a98ff0acbac..00000000000
--- a/mysql-test/suite/atomic/create_replace,ib,row.result
+++ /dev/null
@@ -1,661 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.TRG
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,ib.result b/mysql-test/suite/atomic/create_replace,ib.result
deleted file mode 100644
index 82041ed7aeb..00000000000
--- a/mysql-test/suite/atomic/create_replace,ib.result
+++ /dev/null
@@ -1,648 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.TRG
-t1.frm
-t1.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.frm
-t1.ibd
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,myisam,row.result b/mysql-test/suite/atomic/create_replace,myisam,row.result
deleted file mode 100644
index 507969c557a..00000000000
--- a/mysql-test/suite/atomic/create_replace,myisam,row.result
+++ /dev/null
@@ -1,710 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-)
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace,row.result b/mysql-test/suite/atomic/create_replace,row.result
deleted file mode 100644
index d081b92953f..00000000000
--- a/mysql-test/suite/atomic/create_replace,row.result
+++ /dev/null
@@ -1,710 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) PAGE_CHECKSUM=1
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) PAGE_CHECKSUM=1
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) PAGE_CHECKSUM=1
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) PAGE_CHECKSUM=1
-master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace.combinations b/mysql-test/suite/atomic/create_replace.combinations
deleted file mode 100644
index 09eb352b1cd..00000000000
--- a/mysql-test/suite/atomic/create_replace.combinations
+++ /dev/null
@@ -1,6 +0,0 @@
-[ib]
-[myisam]
-[aria]
-[aria_notrans]
-[expensive_rename]
-[lock_tables]
diff --git a/mysql-test/suite/atomic/create_replace.result b/mysql-test/suite/atomic/create_replace.result
deleted file mode 100644
index 2c82dbce03e..00000000000
--- a/mysql-test/suite/atomic/create_replace.result
+++ /dev/null
@@ -1,696 +0,0 @@
-# Crash recovery
-Table	Create Table
-const_table	CREATE TABLE `const_table` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-# QUERY: CREATE OR REPLACE TABLE t1 (new int)
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 (new int)
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 LIKE const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# QUERY: CREATE OR REPLACE TABLE t1 SELECT * from const_table
-# CRASH POINT: ddl_log_create_before_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_drop_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_log_rename_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_frm
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_create_table
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_drop
-# No crash!
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_after_send_data
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_save_backup
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_install_new
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_before_binlog
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_prepare_eof
-t1.DATA1
-t1.DATA2
-t1.TRG
-t1.frm
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_after_binlog
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_fk_fail
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail2
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_fk_fail3
-t1.TRG
-t1.frm
-t1.ibd
-t2.frm
-t2.ibd
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `old` int(11) NOT NULL,
-  `y` int(11) DEFAULT NULL,
-  PRIMARY KEY (`old`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-old	y
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-a	INSERT	t1	set @s= 1	BEFORE						
-# CRASH POINT: ddl_log_create_log_complete
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete2
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-# CRASH POINT: ddl_log_create_log_complete3
-t1.DATA1
-t1.DATA2
-t1.frm
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 SELECT * from const_table
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `new` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-new	b
-1	1
-2	2
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
-Warnings:
-Note	1051	Unknown table 'test.t1'
diff --git a/mysql-test/suite/atomic/create_replace.test b/mysql-test/suite/atomic/create_replace.test
deleted file mode 100644
index 7cb6d349444..00000000000
--- a/mysql-test/suite/atomic/create_replace.test
+++ /dev/null
@@ -1,211 +0,0 @@
---source include/have_debug.inc
---source include/have_sequence.inc
---source include/have_innodb.inc
---source include/binlog_formats.inc
---source include/not_valgrind.inc
-
---disable_query_log
-let $default_engine=InnoDB;
-let $extra_option= '';
-let $save_debug=`select @@debug_dbug`;
-let $show_error=0;
-let $drop_error=0;
-
-if ($MTR_COMBINATION_MYISAM)
-{
-  let $default_engine=MyISAM;
-}
-if ($MTR_COMBINATION_ARIA)
-{
-  let $default_engine=Aria;
-  call mtr.add_suppression("Checking table");
-  call mtr.add_suppression("marked as crashed");
-}
-if ($MTR_COMBINATION_ARIA_NOTRANS)
-{
-  let $default_engine=Aria;
-  let $extra_option=' engine=aria,transactional=0';
-  call mtr.add_suppression("Checking table");
-  call mtr.add_suppression("marked as crashed");
-}
-if ($MTR_COMBINATION_EXPENSIVE_RENAME)
-{
-  # Disable atomic CREATE OR REPLACE (emulates HTON_EXPENSIVE_RENAME flag)
-  let $default_engine=MyISAM;
-  let $show_error=0, ER_NO_SUCH_TABLE;
-  let $drop_error=0, ER_BAD_TABLE_ERROR;
-  set @@debug_dbug="+d,ddl_log_expensive_rename";
-}
-if ($MTR_COMBINATION_LOCK_TABLES)
-{
-  let $default_engine=Aria;
-  call mtr.add_suppression("Checking table");
-  call mtr.add_suppression("marked as crashed");
-}
-
-if ($MTR_COMBINATION_STMT)
-{
-  let $binlog_format=include/set_binlog_format_statement.sql;
-}
-if ($MTR_COMBINATION_ROW)
-{
-  let $binlog_format=include/set_binlog_format_row.sql;
-}
-if ($MTR_COMBINATION_MIX)
-{
-  --skip same as stmt
-}
-
---eval set @@default_storage_engine=$default_engine
---enable_query_log
-
---echo # Crash recovery
-
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
-
-let $crash_count=19;
-let $crash_points='ddl_log_create_before_install_new',
-                  'ddl_log_create_after_log_drop_backup',
-                  'ddl_log_create_after_log_rename_backup',
-                  'ddl_log_create_before_create_frm',
-                  'ddl_log_create_before_create_table',
-                  'ddl_log_create_after_create_table',
-                  'ddl_log_create_after_drop',
-                  'ddl_log_create_after_send_data',
-                  'ddl_log_create_after_save_backup',
-                  'ddl_log_create_after_install_new',
-                  'ddl_log_create_before_binlog',
-                  'ddl_log_create_after_prepare_eof',
-                  'ddl_log_create_after_binlog',
-                  'ddl_log_create_fk_fail',
-                  'ddl_log_create_fk_fail2',
-                  'ddl_log_create_fk_fail3',
-                  'ddl_log_create_log_complete',
-                  'ddl_log_create_log_complete2',
-                  'ddl_log_create_log_complete3';
-
-#let $crash_count=1;
-#let $crash_points='ddl_log_create_fk_fail';
-#                  'ddl_log_create_before_binlog3',
-#                  'ddl_log_create_before_binlog4';
-
-let $statement_count=3;
-let $statements='CREATE OR REPLACE TABLE t1 (new int) EXTRA_OPTION',
-                'CREATE OR REPLACE TABLE t1 LIKE const_table',
-                'CREATE OR REPLACE TABLE t1 EXTRA_OPTION SELECT * from const_table';
-
-#let $statement_count=1;
-#let $statements='CREATE OR REPLACE TABLE t1 EXTRA_OPTION SELECT * from const_table';
-
---disable_query_log
-let create_const=`select REPLACE('create table const_table (new int, b int) EXTRA_OPTION', ' EXTRA_OPTION', $extra_option)`;
-eval $create_const;
---replace_result $default_engine ENGINE ' PAGE_CHECKSUM=1' '' ' TRANSACTIONAL=0' ''
-show create table const_table;
---enable_query_log
-insert into const_table values (1, 1), (2, 2);
-flush tables;
-
-let $old_debug=`select @@debug_dbug`;
-
-let $keep_include_silent=1;
-let $grep_script=CREATE|DROP;
---disable_query_log
-
-let $r=0;
-while ($r < $statement_count)
-{
-  inc $r;
-  let $STATEMENT=`select REPLACE(ELT($r, $statements), ' EXTRA_OPTION', $extra_option)`;
-  --echo # QUERY: $STATEMENT
-
-  let $c=0;
-  while ($c < $crash_count)
-  {
-    inc $c;
-    let $crash= `select ELT($c, $crash_points)`;
-    let $fk_error= `select '$crash' like 'ddl_log_create_fk_fail%'`;
-
-    --eval set @@default_storage_engine=$default_engine
-    create or replace table t1 (old int);
-    if ($fk_error)
-    {
-      create or replace table t1 (old int primary key, y int) engine innodb;
-      create table t2 (x int references t1(old)) engine innodb;
-    }
-    create trigger a before insert on t1 for each row set @s= 1;
-    flush tables;
-    if ($MTR_COMBINATION_LOCK_TABLES)
-    {
-      lock tables t1 write, const_table read;
-    }
-
-    --source $binlog_format
-
-    RESET MASTER;
-    --echo # CRASH POINT: $crash
-    --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-    --disable_reconnect
-    --eval set @@debug_dbug="+d,$crash",@debug_crash_counter=1
-    let $errno=0;
-    --error 0,2013
-    eval $STATEMENT;
-    let $error=$errno;
-    --enable_reconnect
-    --source include/wait_until_connected_again.inc
-    --disable_query_log
-    --eval set @@debug_dbug="$old_debug"
-
-    if ($error == 0)
-    {
-      --echo # No crash!
-      if ($MTR_COMBINATION_LOCK_TABLES)
-      {
-        unlock tables;
-      }
-    }
-    # Check which tables still exists
-    --replace_result .MAD .DATA1 .MYD .DATA1 .MAI .DATA2 .MYI .DATA2
-    --list_files $MYSQLD_DATADIR/test t*
-    --list_files $MYSQLD_DATADIR/test *sql*
-
-    --let $binlog_file=master-bin.000001
-    --source include/show_binlog_events.inc
-    if ($error)
-    {
-      --let $binlog_file=master-bin.000002
-      --source include/show_binlog_events.inc
-    }
-
-    if ($default_engine == Aria)
-    {
-      # Again we suppress 'marked as crashed', it works differently in --ps
-      --disable_warnings
-    }
-    --replace_result $default_engine ENGINE InnoDB ENGINE ' PAGE_CHECKSUM=1' '' ' TRANSACTIONAL=0' ''
-    --error $show_error
-    show create table t1;
-    --enable_warnings
-    if (`select locate('SELECT', '$STATEMENT')`)
-    {
-      --error $show_error
-      select * from t1;
-    }
-    --enable_warnings
-    --replace_column 6 '' 7 '' 8 '' 9 '' 10 '' 11 ''
-    show triggers;
-    # Drop the tables. The warnings will show what was dropped
-    if ($fk_error)
-    {
-      drop table t2;
-    }
-    --disable_warnings
-    --error $drop_error
-    drop table t1;
-    --enable_warnings
-  }
-}
-drop table if exists t1,const_table;
---eval set @@debug_dbug="$save_debug"
-
---enable_query_log
diff --git a/mysql-test/suite/atomic/create_table.result b/mysql-test/suite/atomic/create_table.result
index aa22e3cb0ed..acc78c76d25 100644
--- a/mysql-test/suite/atomic/create_table.result
+++ b/mysql-test/suite/atomic/create_table.result
@@ -55,6 +55,7 @@ t2.MYI
 t2.frm
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 crash point: ddl_log_create_log_complete
+"No crash!"
 t1.MYD
 t1.MYI
 t1.frm
@@ -62,6 +63,40 @@ t2.MYD
 t2.MYI
 t2.frm
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
+query: CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_after_binlog
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_log_complete
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
 query: CREATE TABLE t1 LIKE const_table
 crash point: ddl_log_create_before_create_frm
 t2.MYD
@@ -115,6 +150,7 @@ t2.MYI
 t2.frm
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 LIKE const_table
 crash point: ddl_log_create_log_complete
+"No crash!"
 t1.MYD
 t1.MYI
 t1.frm
@@ -122,6 +158,40 @@ t2.MYD
 t2.MYI
 t2.frm
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 LIKE const_table
+query: CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_after_binlog
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_log_complete
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
 query: CREATE TABLE t1 SELECT * from t2
 crash point: ddl_log_create_before_create_frm
 t2.MYD
@@ -168,9 +238,16 @@ t2.MYD
 t2.MYI
 t2.frm
 crash point: ddl_log_create_after_binlog
+t1.MYD
+t1.MYI
+t1.frm
 t2.MYD
 t2.MYI
 t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `t1` (
+  `seq` bigint(20) unsigned NOT NULL
+)
+master-bin.000001	#	Annotate_rows	#	#	CREATE TABLE t1 SELECT * from t2
 crash point: ddl_log_create_log_complete
 t1.MYD
 t1.MYI
@@ -182,6 +259,47 @@ master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `t1` (
   `seq` bigint(20) unsigned NOT NULL
 )
 master-bin.000001	#	Annotate_rows	#	#	CREATE TABLE t1 SELECT * from t2
+query: CREATE OR REPLACE TABLE t2 SELECT * from const_table
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t2` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+)
+master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t2 SELECT * from const_table
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_binlog
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t2` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+)
+master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t2 SELECT * from const_table
+crash point: ddl_log_create_log_complete
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t2` (
+  `a` int(11) DEFAULT NULL,
+  `b` int(11) DEFAULT NULL
+)
+master-bin.000001	#	Annotate_rows	#	#	CREATE OR REPLACE TABLE t2 SELECT * from const_table
 engine: innodb
 query: CREATE TABLE t1 (a int)
 crash point: ddl_log_create_before_create_frm
@@ -224,11 +342,42 @@ t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 crash point: ddl_log_create_log_complete
+"No crash!"
 t1.frm
 t1.ibd
 t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
+query: CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+"No crash!"
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_after_binlog
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
+crash point: ddl_log_create_log_complete
+"No crash!"
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 (a int)
 query: CREATE TABLE t1 LIKE const_table
 crash point: ddl_log_create_before_create_frm
 t2.frm
@@ -274,12 +423,47 @@ t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 LIKE const_table
 crash point: ddl_log_create_log_complete
+"No crash!"
 t1.MYD
 t1.MYI
 t1.frm
 t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 LIKE const_table
+query: CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_after_binlog
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
+crash point: ddl_log_create_log_complete
+"No crash!"
+t2.MYD
+t2.MYI
+t2.frm
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 LIKE const_table
 query: CREATE TABLE t1 SELECT * from t2
 crash point: ddl_log_create_before_create_frm
 t2.frm
@@ -310,17 +494,44 @@ t2.ibd
 crash point: ddl_log_create_after_prepare_eof
 t2.frm
 t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 SELECT * from t2
+master-bin.000002	#	Query	#	#	DROP TABLE IF EXISTS `test`.`t1` /* generated by ddl recovery */
 crash point: ddl_log_create_after_binlog
-t1.frm
-t1.ibd
 t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 SELECT * from t2
+master-bin.000002	#	Query	#	#	DROP TABLE IF EXISTS `test`.`t1` /* generated by ddl recovery */
 crash point: ddl_log_create_log_complete
 t1.frm
 t1.ibd
 t2.frm
 t2.ibd
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 SELECT * from t2
+query: CREATE OR REPLACE TABLE t2 SELECT * from const_table
+crash point: ddl_log_create_before_create_frm
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: storage_engine_middle_of_create
+"No crash!"
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 SELECT * from const_table
+crash point: ddl_log_create_before_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_create_table
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_drop
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_before_binlog
+master-bin.000002	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_prepare_eof
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 SELECT * from const_table
+master-bin.000002	#	Query	#	#	DROP TABLE IF EXISTS `test`.`t2` /* generated by ddl recovery */
+crash point: ddl_log_create_after_binlog
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 SELECT * from const_table
+master-bin.000002	#	Query	#	#	DROP TABLE IF EXISTS `test`.`t2` /* generated by ddl recovery */
+crash point: ddl_log_create_log_complete
+t2.frm
+t2.ibd
+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t2 SELECT * from const_table
 Warnings:
 Note	1051	Unknown table 'test.t1,test.t2'
diff --git a/mysql-test/suite/atomic/create_table.test b/mysql-test/suite/atomic/create_table.test
index d2b63de877d..ff53a12ebab 100644
--- a/mysql-test/suite/atomic/create_table.test
+++ b/mysql-test/suite/atomic/create_table.test
@@ -30,10 +30,13 @@ if ($engine_count == "")
 let $crash_count=9;
 let $crash_points='ddl_log_create_before_create_frm', 'storage_engine_middle_of_create', 'ddl_log_create_before_create_table', 'ddl_log_create_after_create_table', 'ddl_log_create_after_drop', 'ddl_log_create_before_binlog', 'ddl_log_create_after_prepare_eof', 'ddl_log_create_after_binlog', 'ddl_log_create_log_complete';
 
-let $statement_count=3;
+let $statement_count=6;
 let $statements='CREATE TABLE t1 (a int)',
+                'CREATE OR REPLACE TABLE t2 (a int)',
                 'CREATE TABLE t1 LIKE const_table',
-                'CREATE TABLE t1 SELECT * from t2';
+                'CREATE OR REPLACE TABLE t2 LIKE const_table',
+                'CREATE TABLE t1 SELECT * from t2',
+                'CREATE OR REPLACE TABLE t2 SELECT * from const_table';
 
 create table const_table (a int, b int) engine=myisam;
 insert into const_table values (1,1),(2,2);
@@ -51,8 +54,6 @@ while ($e < $engine_count)
   inc $e;
   let $engine=`select ELT($e, $engines)`;
   let $default_engine=$engine;
-  # Note: $extra_option is not used. This dead code here is for conformity with
-  # other tests.
   let $extra_option=;
 
   if ($engine == "aria")
diff --git a/mysql-test/suite/binlog/include/binlog.test b/mysql-test/suite/binlog/include/binlog.test
index 1061cf51018..9f3288b52f0 100644
--- a/mysql-test/suite/binlog/include/binlog.test
+++ b/mysql-test/suite/binlog/include/binlog.test
@@ -419,7 +419,6 @@ create table t (old_table_field int);
 create or replace table t as select 1 as b, 2 as b;
 --error ER_DUP_FIELDNAME
 create or replace temporary table t as select 1 as b, 2 as b;
-drop table t;
 create table t (new_table_field int);
 
 --source include/show_binlog_events.inc
diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
index c0e4e6f46be..fa111106cd6 100644
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result
@@ -1085,14 +1085,14 @@ create or replace table t as select 1 as b, 2 as b;
 ERROR 42S21: Duplicate column name 'b'
 create or replace temporary table t as select 1 as b, 2 as b;
 ERROR 42S21: Duplicate column name 'b'
-drop table t;
 create table t (new_table_field int);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t (old_table_field int)
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t` /* generated by server */
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t`/* Generated to handle failed CREATE OR REPLACE */
+master-bin.000001	#	Query	#	#	ROLLBACK
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t (new_table_field int)
 drop table t;
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
index dc0b3c2b4a1..f48b624ec21 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -682,16 +682,15 @@ create or replace table t as select 1 as b, 2 as b;
 ERROR 42S21: Duplicate column name 'b'
 create or replace temporary table t as select 1 as b, 2 as b;
 ERROR 42S21: Duplicate column name 'b'
-drop table t;
 create table t (new_table_field int);
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t (old_table_field int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t`/* Generated to handle failed CREATE OR REPLACE */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t`/* Generated to handle failed CREATE OR REPLACE */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t`/* Generated to handle failed CREATE OR REPLACE */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t (new_table_field int)
 drop table t;
diff --git a/mysql-test/suite/binlog/r/binlog_write_error.result b/mysql-test/suite/binlog/r/binlog_write_error.result
index eb83a1805e6..46a233718d9 100644
--- a/mysql-test/suite/binlog/r/binlog_write_error.result
+++ b/mysql-test/suite/binlog/r/binlog_write_error.result
@@ -9,8 +9,6 @@ CREATE TABLE t1 (a INT);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
 set @@global.debug_dbug = @saved_dbug;
 INSERT INTO t1 VALUES (1),(2),(3);
-ERROR 42S02: Table 'test.t1' doesn't exist
-CREATE TABLE t1 (a INT);
 set @saved_dbug = @@global.debug_dbug;
 SET GLOBAL debug_dbug='d,injecting_fault_writing';
 INSERT INTO t1 VALUES (4),(5),(6);
diff --git a/mysql-test/suite/binlog/t/binlog_write_error.test b/mysql-test/suite/binlog/t/binlog_write_error.test
index f62d1f1fd49..bd1cb5301b3 100644
--- a/mysql-test/suite/binlog/t/binlog_write_error.test
+++ b/mysql-test/suite/binlog/t/binlog_write_error.test
@@ -30,11 +30,8 @@ call mtr.add_suppression("Write to binary log failed: Error writing file*");
 let $query= CREATE TABLE t1 (a INT);
 source include/binlog_inject_error.inc;
 
---error ER_NO_SUCH_TABLE
 INSERT INTO t1 VALUES (1),(2),(3);
 
-CREATE TABLE t1 (a INT);
-
 let $query= INSERT INTO t1 VALUES (4),(5),(6);
 source include/binlog_inject_error.inc;
 
diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.result b/mysql-test/suite/binlog_encryption/binlog_write_error.result
index eb83a1805e6..46a233718d9 100644
--- a/mysql-test/suite/binlog_encryption/binlog_write_error.result
+++ b/mysql-test/suite/binlog_encryption/binlog_write_error.result
@@ -9,8 +9,6 @@ CREATE TABLE t1 (a INT);
 ERROR HY000: Error writing file 'master-bin' ((errno: #)
 set @@global.debug_dbug = @saved_dbug;
 INSERT INTO t1 VALUES (1),(2),(3);
-ERROR 42S02: Table 'test.t1' doesn't exist
-CREATE TABLE t1 (a INT);
 set @saved_dbug = @@global.debug_dbug;
 SET GLOBAL debug_dbug='d,injecting_fault_writing';
 INSERT INTO t1 VALUES (4),(5),(6);
diff --git a/mysql-test/suite/innodb/r/foreign_key_not_windows.result b/mysql-test/suite/innodb/r/foreign_key_not_windows.result
index 02b2e3c29af..aaff06f8d68 100644
--- a/mysql-test/suite/innodb/r/foreign_key_not_windows.result
+++ b/mysql-test/suite/innodb/r/foreign_key_not_windows.result
@@ -6,20 +6,11 @@ CREATE DATABASE `d255`;
 CREATE TABLE `d255`.`d255`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
 ERROR HY000: Long database name and identifier for object resulted in path length exceeding 512 characters. Path: './@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023/@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@
-CREATE OR REPLACE TABLE `d255`.`d255`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-ERROR HY000: Long database name and identifier for object resulted in path length exceeding 511 characters. Path: './@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023/@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@
 CREATE TABLE `d255`.`_##################################################`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
 ERROR HY000: Long database name and identifier for object resulted in path length exceeding 512 characters. Path: './@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023/_@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023
-CREATE OR REPLACE TABLE `d255`.`_##################################################`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-ERROR HY000: Long database name and identifier for object resulted in path length exceeding 511 characters. Path: './@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023/_@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023@0023
 CREATE TABLE `d255`.`##################################################`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-CREATE OR REPLACE TABLE `d255`.`d245`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-DROP TABLE `d255`.`d245`;
 #
 # MDEV-29258 Failing assertion for name length on RENAME TABLE
 #
@@ -38,37 +29,3 @@ RENAME TABLE `d255`.u TO u;
 DROP TABLE u;
 DROP DATABASE `d255`;
 # End of 10.3 tests
-#
-# MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name
-#
-set names utf8;
-create database `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎`;
-use `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎`;
-create table t (a int primary key) engine=innodb;
-create table u (
-a int primary key,
-constraint `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎` foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	1	0
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	a	a	0
-create or replace table u (
-a int primary key,
-constraint `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎` foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	1	0
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@274e@27	a	a	0
-show create table u;
-Table	Create Table
-u	CREATE TABLE `u` (
-  `a` int(11) NOT NULL,
-  PRIMARY KEY (`a`),
-  CONSTRAINT `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎` FOREIGN KEY (`a`) REFERENCES `t` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-use test;
-drop database `❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎❎`;
diff --git a/mysql-test/suite/innodb/t/foreign_key_not_windows.test b/mysql-test/suite/innodb/t/foreign_key_not_windows.test
index 67e8935c660..e5f42a0ddab 100644
--- a/mysql-test/suite/innodb/t/foreign_key_not_windows.test
+++ b/mysql-test/suite/innodb/t/foreign_key_not_windows.test
@@ -25,43 +25,20 @@ CREATE TABLE t (a INT PRIMARY KEY) ENGINE=InnoDB;
 # corresponding to the 51 characters below: 5*51=255.
 let $d255=###################################################;
 let $d250=##################################################;
-let $d245=#####################;
-# FIXME: MDEV-29258
-# let $d245=#################################################;
 --replace_result $d255 d255
 eval CREATE DATABASE `$d255`;
-
 --replace_result $d255 d255
 --error ER_IDENT_CAUSES_TOO_LONG_PATH
 eval CREATE TABLE `$d255`.`$d255`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-
---replace_result $d255 d255
---error ER_IDENT_CAUSES_TOO_LONG_PATH
-eval CREATE OR REPLACE TABLE `$d255`.`$d255`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-
 --replace_result $d255 d255
 --error ER_IDENT_CAUSES_TOO_LONG_PATH
 eval CREATE TABLE `$d255`.`_$d250`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-
---replace_result $d255 d255
---error ER_IDENT_CAUSES_TOO_LONG_PATH
-eval CREATE OR REPLACE TABLE `$d255`.`_$d250`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-
 --replace_result $d255 d255
 eval CREATE TABLE `$d255`.`$d250`
 (a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
 
---replace_result $d255 d255 $d245 d245
-eval CREATE OR REPLACE TABLE `$d255`.`$d245`
-(a INT PRIMARY KEY, FOREIGN KEY(a) REFERENCES test.t(a)) ENGINE=InnoDB;
-
---replace_result $d255 d255 $d245 d245
-eval DROP TABLE `$d255`.`$d245`;
-
 --echo #
 --echo # MDEV-29258 Failing assertion for name length on RENAME TABLE
 --echo #
@@ -76,6 +53,7 @@ eval DROP TABLE `$d255`.`$d250`;
 eval RENAME TABLE `$d255`.`$d245` TO `$d255`.`$d250`;
 --replace_result $d250 d250 $d255 d255
 eval RENAME TABLE `$d255`.`$d250` TO a;
+--replace_result $d255 d255
 DROP TABLE a,t;
 
 --echo #
@@ -97,26 +75,3 @@ DROP TABLE u;
 eval DROP DATABASE `$d255`;
 
 --echo # End of 10.3 tests
-
---echo #
---echo # MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name
---echo #
-set names utf8;
-let $d= `select repeat('❎', 45)`;
-let $t= `select repeat('❎', 64)`;
-eval create database `$d`;
-eval use `$d`;
-create table t (a int primary key) engine=innodb;
-eval create table u (
-  a int primary key,
-  constraint `$t` foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-eval create or replace table u (
-  a int primary key,
-  constraint `$t` foreign key d (a) references t (a)) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-show create table u;
-use test;
-eval drop database `$d`;
diff --git a/mysql-test/suite/parts/r/backup_log.result b/mysql-test/suite/parts/r/backup_log.result
index df1dd0e4cdb..be4109965bc 100644
--- a/mysql-test/suite/parts/r/backup_log.result
+++ b/mysql-test/suite/parts/r/backup_log.result
@@ -2,7 +2,7 @@ connect  con1,localhost,root,,;
 BACKUP STAGE START;
 connection default;
 #
-# Testing normal tables
+# Testing with normal tables
 #
 create table t1 (a int) engine=myisam PARTITION BY HASH(a) PARTITIONS 2;
 insert into t1 values (1),(2);
@@ -17,17 +17,6 @@ optimize table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 drop table t1;
-#
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t1,id: 1,,0,,,
-ALTER,MyISAM,1,test,t1,id: 1,MyISAM,1,test,t1,id: 2
-RENAME,MyISAM,1,test,t1,id: 2,MyISAM,1,test,t2,id: 2
-RENAME,MyISAM,1,test,t2,id: 2,MyISAM,1,test,t1,id: 2
-TRUNCATE,MyISAM,1,test,t1,id: 2,,0,,,
-repair,MyISAM,1,test,t1,id: 2,,0,,,
-optimize,MyISAM,1,test,t1,id: 2,,0,,,
-DROP,MyISAM,1,test,t1,id: 2,,0,,,
 create table t1_innodb (a int) engine=innodb PARTITION BY HASH(a) PARTITIONS 2;
 insert into t1_innodb values (1),(2);
 alter table t1_innodb add column b int;
@@ -43,17 +32,6 @@ test.t1_innodb	optimize	note	Table does not support optimize, doing recreate + a
 test.t1_innodb	optimize	status	OK
 drop table t1_innodb;
 #
-# Reading backup ddl log file
-#
-CREATE,InnoDB,1,test,t1_innodb,id: 1,,0,,,
-ALTER,InnoDB,1,test,t1_innodb,id: 1,InnoDB,1,test,t1_innodb,id: 2
-RENAME,InnoDB,1,test,t1_innodb,id: 2,InnoDB,1,test,t2_innodb,id: 2
-RENAME,InnoDB,1,test,t2_innodb,id: 2,InnoDB,1,test,t1_innodb,id: 2
-TRUNCATE,InnoDB,1,test,t1_innodb,id: 2,,0,,,
-repair,InnoDB,1,test,t1_innodb,id: 2,,0,,,
-ALTER,InnoDB,1,test,t1_innodb,id: 2,InnoDB,1,test,t1_innodb,id: 3
-DROP,InnoDB,1,test,t1_innodb,id: 3,,0,,,
-#
 # Testing with temporary tables (should not be logged)
 #
 create temporary table tmp_t10 (a int) engine=myisam;
@@ -63,9 +41,6 @@ rename table tmp_t11 to tmp_t10;
 truncate table tmp_t10;
 drop table tmp_t10;
 #
-# Reading backup ddl log file
-#
-#
 # Testing with mix of normal and temporary tables
 #
 create temporary table tmp_t20 (a int);
@@ -80,13 +55,6 @@ drop table if exists tmp_t21,t21;
 Warnings:
 Note	1051	Unknown table 'test.tmp_t21'
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t20,id: 1,,0,,,
-DROP,MyISAM,1,test,t20,id: 1,,0,,,
-CREATE,MyISAM,1,test,t21,id: 2,,0,,,
-DROP,MyISAM,1,test,t21,id: 2,,0,,,
-#
 # Testing create select
 #
 create table t30 (a int) PARTITION BY HASH(a) PARTITIONS 2;
@@ -99,18 +67,7 @@ ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 create table t32 (a int) PARTITION BY HASH(a) PARTITIONS 2;
 drop table if exists t30,t31,t32,tmp_t30;
 Warnings:
-Note	1051	Unknown table 'test.tmp_t30'
-#
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t30,id: 1,,0,,,
-CREATE,MyISAM,1,test,t31,id: 2,,0,,,
-DROP,MyISAM,1,test,t31,id: 2,,0,,,
-CREATE,MyISAM,0,test,t31,id: 3,,0,,,
-CREATE,MyISAM,1,test,t32,id: 4,,0,,,
-DROP,MyISAM,1,test,t30,id: 1,,0,,,
-DROP,MyISAM,0,test,t31,id: 3,,0,,,
-DROP,MyISAM,1,test,t32,id: 4,,0,,,
+Note	1051	Unknown table 'test.t31,test.tmp_t30'
 #
 # Testing create LIKE
 #
@@ -128,17 +85,6 @@ t42	CREATE TABLE `t42` (
 PARTITIONS 2
 drop table t40, t41, t42;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t40,id: 1,,0,,,
-CREATE,InnoDB,1,test,t41,id: 2,,0,,,
-CREATE,partition,0,test,t42,id: 3,,0,,,
-DROP,MyISAM,1,test,t42,id: 3,,0,,,
-CREATE,partition,0,test,t42,id: 4,,0,,,
-DROP,MyISAM,1,test,t40,id: 1,,0,,,
-DROP,InnoDB,1,test,t41,id: 2,,0,,,
-DROP,InnoDB,1,test,t42,id: 4,,0,,,
-#
 # Testing rename
 #
 create table t50 (a int) PARTITION BY HASH(a) PARTITIONS 2;
@@ -147,18 +93,6 @@ rename table t50 to t52, t51 to t53;
 rename table t52 to tmp, t53 to t52, tmp to t53;
 drop table t52,t53;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t50,id: 1,,0,,,
-CREATE,MyISAM,1,test,t51,id: 2,,0,,,
-RENAME,MyISAM,1,test,t50,id: 1,MyISAM,1,test,t52,id: 1
-RENAME,MyISAM,1,test,t51,id: 2,MyISAM,1,test,t53,id: 2
-RENAME,MyISAM,1,test,t52,id: 1,MyISAM,1,test,tmp,id: 1
-RENAME,MyISAM,1,test,t53,id: 2,MyISAM,1,test,t52,id: 2
-RENAME,MyISAM,1,test,tmp,id: 1,MyISAM,1,test,t53,id: 1
-DROP,MyISAM,1,test,t52,id: 2,,0,,,
-DROP,MyISAM,1,test,t53,id: 1,,0,,,
-#
 # Testing enable/disable keys
 #
 CREATE TABLE t60 (a int(10), index(a) ) ENGINE=Aria PARTITION BY HASH(a) PARTITIONS 2;
@@ -172,13 +106,6 @@ INSERT INTO t61 VALUES(1),(2),(3);
 ALTER TABLE t61 DISABLE KEYS;
 DROP TABLE t61;
 #
-# Reading backup ddl log file
-#
-CREATE,Aria,1,test,t60,id: 1,,0,,,
-CHANGE_INDEX,Aria,1,test,t60,id: 1,,0,,,
-CHANGE_INDEX,Aria,1,test,t60,id: 1,,0,,,
-DROP,Aria,1,test,t60,id: 1,,0,,,
-#
 # Testing load data
 #
 create table t70 (a date, b date, c date not null, d date) engine=aria PARTITION BY HASH(YEAR(a)) PARTITIONS 2;
@@ -195,30 +122,11 @@ insert into t71 select * from t70;
 unlock tables;
 drop table t70,t71;
 #
-# Reading backup ddl log file
-#
-CREATE,Aria,1,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 1,,0,,,
-TRUNCATE,Aria,1,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 1,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 1,,0,,,
-CREATE,Aria,1,test,t71,id: 2,,0,,,
-BULK_INSERT,Aria,1,test,t71,id: 2,,0,,,
-BULK_INSERT,Aria,1,test,t71,id: 2,,0,,,
-DROP,Aria,1,test,t70,id: 1,,0,,,
-DROP,Aria,1,test,t71,id: 2,,0,,,
-#
 # Testing strange table names
 #
 create table `t 1` (a int) PARTITION BY HASH(a) PARTITIONS 2;
 drop table `t 1`;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t@00201,id: 1,,0,,,
-DROP,MyISAM,1,test,t@00201,id: 1,,0,,,
-#
 # Testing views and triggers
 #
 create table t80 (a int, b int) engine=myisam PARTITION BY HASH(a) PARTITIONS 2;
@@ -228,27 +136,12 @@ drop trigger trg;
 drop view v1;
 drop table t80;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t80,id: 1,,0,,,
-CREATE,VIEW,0,test,v1,,,0,,,
-CREATE,TRIGGER,0,test,trg,,,0,,,
-DROP,TRIGGER,0,test,trg,,,0,,,
-DROP,VIEW,0,test,v1,,,0,,,
-DROP,MyISAM,1,test,t80,id: 1,,0,,,
-#
 # Testing alter to a new storage engine
 #
 create table t85 (a int primary key, b int) engine=myisam PARTITION BY HASH(a) PARTITIONS 2;
 alter table t85 engine=innodb;
 drop table t85;
 #
-# Reading backup ddl log file
-#
-CREATE,MyISAM,1,test,t85,id: 1,,0,,,
-ALTER,MyISAM,1,test,t85,id: 1,InnoDB,1,test,t85,id: 2
-DROP,InnoDB,1,test,t85,id: 2,,0,,,
-#
 # Testing backup ddl log for partitioned tables
 #
 CREATE TABLE t200(a INT, b INT) ENGINE ARIA TRANSACTIONAL = 1 PAGE_CHECKSUM = 1;
@@ -291,22 +184,94 @@ DROP TABLE t220;
 #
 # Reading backup ddl log file
 #
-CREATE,Aria,0,test,t200,id: 1,,0,,,
-ALTER,Aria,0,test,t200,id: 1,Aria,1,test,t200,id: 2
-CREATE,Aria,0,test,t210,id: 3,,0,,,
-EXCHANGE_PARTITION,Aria,1,test,t200,id: 2,Aria,0,test,t210,id: 3
-ALTER,Aria,1,test,t200,id: 2,Aria,1,test,t200,id: 4
-ALTER,Aria,1,test,t200,id: 4,Aria,1,test,t200,id: 5
-ALTER,Aria,1,test,t200,id: 5,Aria,1,test,t200,id: 6
-ALTER,Aria,1,test,t200,id: 6,Aria,1,test,t200,id: 7
-ALTER,Aria,1,test,t200,id: 7,Aria,1,test,t200,id: 8
-ALTER,Aria,1,test,t200,id: 8,Aria,1,test,t200,id: 9
-ALTER,Aria,1,test,t200,id: 9,Aria,1,test,t200,id: 10
-ALTER,Aria,1,test,t200,id: 10,Aria,0,test,t200,id: 11
-DROP,Aria,0,test,t200,id: 11,,0,,,
-DROP,Aria,0,test,t210,id: 3,,0,,,
-CREATE,Aria,1,test,t220,id: 12,,0,,,
-DROP,Aria,1,test,t220,id: 12,,0,,,
+CREATE,MyISAM,1,test,t1,id: 1,,0,,,
+ALTER,MyISAM,1,test,t1,id: 1,MyISAM,1,test,t1,id: 2
+RENAME,MyISAM,1,test,t1,id: 2,MyISAM,1,test,t2,id: 2
+RENAME,MyISAM,1,test,t2,id: 2,MyISAM,1,test,t1,id: 2
+TRUNCATE,MyISAM,1,test,t1,id: 2,,0,,,
+repair,MyISAM,1,test,t1,id: 2,,0,,,
+optimize,MyISAM,1,test,t1,id: 2,,0,,,
+DROP,MyISAM,1,test,t1,id: 2,,0,,,
+CREATE,InnoDB,1,test,t1_innodb,id: 3,,0,,,
+ALTER,InnoDB,1,test,t1_innodb,id: 3,InnoDB,1,test,t1_innodb,id: 4
+RENAME,InnoDB,1,test,t1_innodb,id: 4,InnoDB,1,test,t2_innodb,id: 4
+RENAME,InnoDB,1,test,t2_innodb,id: 4,InnoDB,1,test,t1_innodb,id: 4
+TRUNCATE,InnoDB,1,test,t1_innodb,id: 4,,0,,,
+repair,InnoDB,1,test,t1_innodb,id: 4,,0,,,
+ALTER,InnoDB,1,test,t1_innodb,id: 4,InnoDB,1,test,t1_innodb,id: 5
+DROP,InnoDB,1,test,t1_innodb,id: 5,,0,,,
+CREATE,MyISAM,1,test,t20,id: 6,,0,,,
+DROP,MyISAM,1,test,t20,id: 6,,0,,,
+CREATE,MyISAM,1,test,t21,id: 7,,0,,,
+DROP,MyISAM,1,test,t21,id: 7,,0,,,
+CREATE,MyISAM,1,test,t30,id: 8,,0,,,
+CREATE,MyISAM,1,test,t31,id: 9,,0,,,
+DROP,MyISAM,1,test,t31,id: 9,,0,,,
+CREATE,MyISAM,0,test,t31,id: 10,,0,,,
+DROP,MyISAM,0,test,t31,id: 10,,0,,,
+DROP_AFTER_CREATE,MyISAM,1,test,t31,id: 11,,0,,,
+CREATE,MyISAM,1,test,t32,id: 12,,0,,,
+DROP,MyISAM,1,test,t30,id: 8,,0,,,
+DROP,MyISAM,1,test,t32,id: 12,,0,,,
+CREATE,MyISAM,1,test,t40,id: 13,,0,,,
+CREATE,InnoDB,1,test,t41,id: 14,,0,,,
+CREATE,partition,0,test,t42,id: 15,,0,,,
+DROP,MyISAM,1,test,t42,id: 15,,0,,,
+CREATE,partition,0,test,t42,id: 16,,0,,,
+DROP,MyISAM,1,test,t40,id: 13,,0,,,
+DROP,InnoDB,1,test,t41,id: 14,,0,,,
+DROP,InnoDB,1,test,t42,id: 16,,0,,,
+CREATE,MyISAM,1,test,t50,id: 17,,0,,,
+CREATE,MyISAM,1,test,t51,id: 18,,0,,,
+RENAME,MyISAM,1,test,t50,id: 17,MyISAM,1,test,t52,id: 17
+RENAME,MyISAM,1,test,t51,id: 18,MyISAM,1,test,t53,id: 18
+RENAME,MyISAM,1,test,t52,id: 17,MyISAM,1,test,tmp,id: 17
+RENAME,MyISAM,1,test,t53,id: 18,MyISAM,1,test,t52,id: 18
+RENAME,MyISAM,1,test,tmp,id: 17,MyISAM,1,test,t53,id: 17
+DROP,MyISAM,1,test,t52,id: 18,,0,,,
+DROP,MyISAM,1,test,t53,id: 17,,0,,,
+CREATE,Aria,1,test,t60,id: 19,,0,,,
+CHANGE_INDEX,Aria,1,test,t60,id: 19,,0,,,
+CHANGE_INDEX,Aria,1,test,t60,id: 19,,0,,,
+DROP,Aria,1,test,t60,id: 19,,0,,,
+CREATE,Aria,1,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,1,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,1,test,t70,id: 20,,0,,,
+TRUNCATE,Aria,1,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,1,test,t70,id: 20,,0,,,
+BULK_INSERT,Aria,1,test,t70,id: 20,,0,,,
+CREATE,Aria,1,test,t71,id: 21,,0,,,
+BULK_INSERT,Aria,1,test,t71,id: 21,,0,,,
+BULK_INSERT,Aria,1,test,t71,id: 21,,0,,,
+DROP,Aria,1,test,t70,id: 20,,0,,,
+DROP,Aria,1,test,t71,id: 21,,0,,,
+CREATE,MyISAM,1,test,t@00201,id: 22,,0,,,
+DROP,MyISAM,1,test,t@00201,id: 22,,0,,,
+CREATE,MyISAM,1,test,t80,id: 23,,0,,,
+CREATE,VIEW,0,test,v1,,,0,,,
+CREATE,TRIGGER,0,test,trg,,,0,,,
+DROP,TRIGGER,0,test,trg,,,0,,,
+DROP,VIEW,0,test,v1,,,0,,,
+DROP,MyISAM,1,test,t80,id: 23,,0,,,
+CREATE,MyISAM,1,test,t85,id: 24,,0,,,
+ALTER,MyISAM,1,test,t85,id: 24,InnoDB,1,test,t85,id: 25
+DROP,InnoDB,1,test,t85,id: 25,,0,,,
+CREATE,Aria,0,test,t200,id: 26,,0,,,
+ALTER,Aria,0,test,t200,id: 26,Aria,1,test,t200,id: 27
+CREATE,Aria,0,test,t210,id: 28,,0,,,
+EXCHANGE_PARTITION,Aria,1,test,t200,id: 27,Aria,0,test,t210,id: 28
+ALTER,Aria,1,test,t200,id: 27,Aria,1,test,t200,id: 29
+ALTER,Aria,1,test,t200,id: 29,Aria,1,test,t200,id: 30
+ALTER,Aria,1,test,t200,id: 30,Aria,1,test,t200,id: 31
+ALTER,Aria,1,test,t200,id: 31,Aria,1,test,t200,id: 32
+ALTER,Aria,1,test,t200,id: 32,Aria,1,test,t200,id: 33
+ALTER,Aria,1,test,t200,id: 33,Aria,1,test,t200,id: 34
+ALTER,Aria,1,test,t200,id: 34,Aria,1,test,t200,id: 35
+ALTER,Aria,1,test,t200,id: 35,Aria,0,test,t200,id: 36
+DROP,Aria,0,test,t200,id: 36,,0,,,
+DROP,Aria,0,test,t210,id: 28,,0,,,
+CREATE,Aria,1,test,t220,id: 37,,0,,,
+DROP,Aria,1,test,t220,id: 37,,0,,,
 #
 # Cleanup
 #
diff --git a/mysql-test/suite/rpl/r/create_or_replace2,stmt.rdiff b/mysql-test/suite/rpl/r/create_or_replace2,stmt.rdiff
deleted file mode 100644
index 52dd3828b38..00000000000
--- a/mysql-test/suite/rpl/r/create_or_replace2,stmt.rdiff
+++ /dev/null
@@ -1,17 +0,0 @@
---- create_or_replace2.result
-+++ create_or_replace2,stmt.reject
-@@ -34,9 +34,11 @@
- master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
- RETURN ( SELECT MAX(a) FROM t1 )
- master-bin.000001	#	Gtid	#	#	GTID #-#-#
--master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
--  `b` int(11) DEFAULT NULL
--) ENGINE=InnoDB
-+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tmp (b INT) ENGINE=InnoDB
-+master-bin.000001	#	Gtid	#	#	GTID #-#-#
-+master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE t1 LIKE tmp
-+master-bin.000001	#	Gtid	#	#	GTID #-#-#
-+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `tmp`
- drop function f1;
- drop table t1;
- include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/create_or_replace2.result b/mysql-test/suite/rpl/r/create_or_replace2.result
index 149fe545778..adcceaf97dd 100644
--- a/mysql-test/suite/rpl/r/create_or_replace2.result
+++ b/mysql-test/suite/rpl/r/create_or_replace2.result
@@ -26,17 +26,6 @@ unlock tables;
 connection default;
 ERROR 42S22: Unknown column 'a' in 'field list'
 disconnect con1;
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT) ENGINE=InnoDB
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
-RETURN ( SELECT MAX(a) FROM t1 )
-master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t1` (
-  `b` int(11) DEFAULT NULL
-) ENGINE=InnoDB
 drop function f1;
 drop table t1;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/create_or_replace_mix.result b/mysql-test/suite/rpl/r/create_or_replace_mix.result
index fbcdc0ecc44..3917b5b7c05 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_mix.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_mix.result
@@ -64,12 +64,13 @@ create table t1 (a int);
 create or replace table t1;
 ERROR 42000: A table must have at least 1 column
 drop table if exists t1;
-create or replace table t1 (b int primary key) select a as b from t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-create table t1 (c int);
-create or replace table t1 (d int primary key) select a as d from t2;
+create table t1 (a int);
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-drop table t1;
 create temporary table t9 (a int);
 create or replace temporary table t9 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
@@ -79,26 +80,34 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; create or replace table t1
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (c int)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create temporary table t9 (a int)
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t9`/* Generated to handle failed CREATE OR REPLACE */
 connection server_2;
 show tables;
 Tables_in_test
 t2
 connection server_1;
-create table t1 (e int);
+create table t1 (a int);
 create or replace table t1 (a int, a int) select * from t2;
 ERROR 42S21: Duplicate column name 'a'
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (e int)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
 drop table if exists t1,t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
 drop temporary table if exists t9;
 Warnings:
 Note	1051	Unknown table 'test.t9'
@@ -208,7 +217,7 @@ drop table t1;
 #
 connection server_2;
 connection server_1;
-create table t1 (f int);
+create table t1 (a int);
 insert into t1 values (0),(1),(2);
 create table t2 engine=myisam select * from t1;
 create or replace table t2 engine=innodb select * from t1;
@@ -217,7 +226,7 @@ binlog from server 2
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
-slave-bin.000001	#	Query	#	#	use `test`; create table t1 (f int)
+slave-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; insert into t1 values (0),(1),(2)
 slave-bin.000001	#	Query	#	#	COMMIT
diff --git a/mysql-test/suite/rpl/r/create_or_replace_row.result b/mysql-test/suite/rpl/r/create_or_replace_row.result
index 18c077bd549..3bb99839751 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_row.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_row.result
@@ -92,12 +92,13 @@ create table t1 (a int);
 create or replace table t1;
 ERROR 42000: A table must have at least 1 column
 drop table if exists t1;
-create or replace table t1 (b int primary key) select a as b from t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-create table t1 (c int);
-create or replace table t1 (d int primary key) select a as d from t2;
+create table t1 (a int);
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-drop table t1;
 create temporary table t9 (a int);
 create or replace temporary table t9 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
@@ -107,24 +108,32 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; create or replace table t1
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (c int)
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
+master-bin.000001	#	Query	#	#	ROLLBACK
 connection server_2;
 show tables;
 Tables_in_test
 t2
 connection server_1;
-create table t1 (e int);
+create table t1 (a int);
 create or replace table t1 (a int, a int) select * from t2;
 ERROR 42S21: Duplicate column name 'a'
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (e int)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
+master-bin.000001	#	Query	#	#	ROLLBACK
 drop table if exists t1,t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
 drop temporary table if exists t9;
 Warnings:
 Note	1051	Unknown table 'test.t9'
@@ -234,7 +243,7 @@ drop table t1;
 #
 connection server_2;
 connection server_1;
-create table t1 (f int);
+create table t1 (a int);
 insert into t1 values (0),(1),(2);
 create table t2 engine=myisam select * from t1;
 create or replace table t2 engine=innodb select * from t1;
@@ -243,7 +252,7 @@ binlog from server 2
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
-slave-bin.000001	#	Query	#	#	use `test`; create table t1 (f int)
+slave-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Annotate_rows	#	#	insert into t1 values (0),(1),(2)
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -251,7 +260,7 @@ slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `t2` (
-  `f` int(11) DEFAULT NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM
 slave-bin.000001	#	Annotate_rows	#	#	create table t2 engine=myisam select * from t1
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
@@ -259,7 +268,7 @@ slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; CREATE OR REPLACE TABLE `t2` (
-  `f` int(11) DEFAULT NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
 slave-bin.000001	#	Annotate_rows	#	#	create or replace table t2 engine=innodb select * from t1
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
diff --git a/mysql-test/suite/rpl/r/create_or_replace_statement.result b/mysql-test/suite/rpl/r/create_or_replace_statement.result
index fbcdc0ecc44..3917b5b7c05 100644
--- a/mysql-test/suite/rpl/r/create_or_replace_statement.result
+++ b/mysql-test/suite/rpl/r/create_or_replace_statement.result
@@ -64,12 +64,13 @@ create table t1 (a int);
 create or replace table t1;
 ERROR 42000: A table must have at least 1 column
 drop table if exists t1;
-create or replace table t1 (b int primary key) select a as b from t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-create table t1 (c int);
-create or replace table t1 (d int primary key) select a as d from t2;
+create table t1 (a int);
+create or replace table t1 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-drop table t1;
 create temporary table t9 (a int);
 create or replace temporary table t9 (a int primary key) select a from t2;
 ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
@@ -79,26 +80,34 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; create or replace table t1
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (c int)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; create temporary table t9 (a int)
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t9`/* Generated to handle failed CREATE OR REPLACE */
 connection server_2;
 show tables;
 Tables_in_test
 t2
 connection server_1;
-create table t1 (e int);
+create table t1 (a int);
 create or replace table t1 (a int, a int) select * from t2;
 ERROR 42S21: Duplicate column name 'a'
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#
-master-bin.000001	#	Query	#	#	use `test`; create table t1 (e int)
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `test`.`t1`/* Generated to handle failed CREATE OR REPLACE */
 drop table if exists t1,t2;
+Warnings:
+Note	1051	Unknown table 'test.t1'
 drop temporary table if exists t9;
 Warnings:
 Note	1051	Unknown table 'test.t9'
@@ -208,7 +217,7 @@ drop table t1;
 #
 connection server_2;
 connection server_1;
-create table t1 (f int);
+create table t1 (a int);
 insert into t1 values (0),(1),(2);
 create table t2 engine=myisam select * from t1;
 create or replace table t2 engine=innodb select * from t1;
@@ -217,7 +226,7 @@ binlog from server 2
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Gtid	#	#	GTID #-#-#
-slave-bin.000001	#	Query	#	#	use `test`; create table t1 (f int)
+slave-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 slave-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; insert into t1 values (0),(1),(2)
 slave-bin.000001	#	Query	#	#	COMMIT
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_strict.result b/mysql-test/suite/rpl/r/rpl_gtid_strict.result
index d246bb31713..7a1e18c4dfd 100644
--- a/mysql-test/suite/rpl/r/rpl_gtid_strict.result
+++ b/mysql-test/suite/rpl/r/rpl_gtid_strict.result
@@ -59,7 +59,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (4)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-*** Test non-transactional GTID error. ***
+*** Test non-transactional GTID error (cannot be rolled back). ***
 SET server_id= 3;
 SET gtid_seq_no= 1;
 ERROR HY000: An attempt was made to binlog GTID 0-3-1 which would create an out-of-order sequence number with existing GTID 0-1-4, and gtid strict mode is enabled
@@ -68,6 +68,9 @@ SET gtid_seq_no= 1;
 SET SESSION debug_dbug=@old_dbug;
 CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=MyISAM;
 ERROR HY000: An attempt was made to binlog GTID 0-3-1 which would create an out-of-order sequence number with existing GTID 0-1-4, and gtid strict mode is enabled
+SET sql_log_bin= 0;
+DROP TABLE t2;
+SET sql_log_bin= 1;
 CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=MyISAM;
 SET gtid_seq_no= 1;
 ERROR HY000: An attempt was made to binlog GTID 0-3-1 which would create an out-of-order sequence number with existing GTID 0-3-5, and gtid strict mode is enabled
diff --git a/mysql-test/suite/rpl/t/create_or_replace.inc b/mysql-test/suite/rpl/t/create_or_replace.inc
index bdde953f7dc..df46cc36e97 100644
--- a/mysql-test/suite/rpl/t/create_or_replace.inc
+++ b/mysql-test/suite/rpl/t/create_or_replace.inc
@@ -47,13 +47,12 @@ create or replace table t1;
 drop table if exists t1;
 # The following is not logged as t1 does not exists;
 --error ER_DUP_ENTRY
-create or replace table t1 (b int primary key) select a as b from t2;
+create or replace table t1 (a int primary key) select a from t2;
 
-create table t1 (c int);
+create table t1 (a int);
 # This should as a delete as we will delete t1
 --error ER_DUP_ENTRY
-create or replace table t1 (d int primary key) select a as d from t2;
-drop table t1;
+create or replace table t1 (a int primary key) select a from t2;
 
 # Same with temporary table
 create temporary table t9 (a int);
@@ -70,7 +69,7 @@ show tables;
 connection server_1;
 
 --let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
-create table t1 (e int);
+create table t1 (a int);
 --error ER_DUP_FIELDNAME
 create or replace table t1 (a int, a int) select * from t2;
 --source include/show_binlog_events.inc
@@ -170,7 +169,7 @@ sync_with_master;
 --let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
 connection server_1;
 
-create table t1 (f int);
+create table t1 (a int);
 insert into t1 values (0),(1),(2);
 create table t2 engine=myisam select * from t1;
 create or replace table t2 engine=innodb select * from t1;
diff --git a/mysql-test/suite/rpl/t/create_or_replace2.test b/mysql-test/suite/rpl/t/create_or_replace2.test
index 0208be577a7..f0091db7fb9 100644
--- a/mysql-test/suite/rpl/t/create_or_replace2.test
+++ b/mysql-test/suite/rpl/t/create_or_replace2.test
@@ -36,8 +36,6 @@ unlock tables;
 --reap
 --disconnect con1
 
---source include/show_binlog_events.inc
-
 # Cleanup
 drop function f1;
 drop table t1;
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_strict.test b/mysql-test/suite/rpl/t/rpl_gtid_strict.test
index 7cbd6304c10..56ebba824c4 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_strict.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_strict.test
@@ -49,7 +49,7 @@ INSERT INTO t1 VALUES (4);
 SELECT * FROM t1 ORDER BY 1;
 --source include/show_binlog_events.inc
 
---echo *** Test non-transactional GTID error. ***
+--echo *** Test non-transactional GTID error (cannot be rolled back). ***
 SET server_id= 3;
 --error ER_GTID_STRICT_OUT_OF_ORDER
 SET gtid_seq_no= 1;
@@ -58,6 +58,11 @@ SET gtid_seq_no= 1;
 SET SESSION debug_dbug=@old_dbug;
 --error ER_GTID_STRICT_OUT_OF_ORDER
 CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=MyISAM;
+# The table is still created, DDL cannot be rolled back.
+# Fix it up for replication.
+SET sql_log_bin= 0;
+DROP TABLE t2;
+SET sql_log_bin= 1;
 CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=MyISAM;
 
 --error ER_GTID_STRICT_OUT_OF_ORDER
diff --git a/mysql-test/suite/versioning/r/foreign.result b/mysql-test/suite/versioning/r/foreign.result
index 8df5a042275..3c8508507fd 100644
--- a/mysql-test/suite/versioning/r/foreign.result
+++ b/mysql-test/suite/versioning/r/foreign.result
@@ -263,13 +263,6 @@ constraint `fk_child_parent`
 on delete cascade
 on update cascade
 ) engine = innodb with system versioning;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/fk_child_parent	test/child	test/parent	2	5
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/fk_child_parent	parent_id	id	0
-test/fk_child_parent	parent_value	value	1
 create or replace table subchild (
 id int not null auto_increment primary key,
 parent_id smallint unsigned not null,
@@ -279,16 +272,6 @@ constraint `fk_subchild_child_parent`
 on delete cascade
 on update cascade
 ) engine=innodb;
-select * from information_schema.innodb_sys_foreign;
-ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/fk_child_parent	test/child	test/parent	2	5
-test/fk_subchild_child_parent	test/subchild	test/child	2	5
-select * from information_schema.innodb_sys_foreign_cols;
-ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/fk_child_parent	parent_id	id	0
-test/fk_child_parent	parent_value	value	1
-test/fk_subchild_child_parent	parent_id	parent_id	0
-test/fk_subchild_child_parent	parent_value	parent_value	1
 insert into parent (value) values (23);
 select id, value from parent into @id, @value;
 Warnings:
diff --git a/mysql-test/suite/versioning/t/foreign.test b/mysql-test/suite/versioning/t/foreign.test
index acd6dde2e4b..934053f83ba 100644
--- a/mysql-test/suite/versioning/t/foreign.test
+++ b/mysql-test/suite/versioning/t/foreign.test
@@ -303,9 +303,6 @@ eval create or replace table child (
     on update cascade
 ) engine = innodb with system versioning;
 
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-
 create or replace table subchild (
   id int not null auto_increment primary key,
   parent_id smallint unsigned not null,
@@ -316,9 +313,6 @@ create or replace table subchild (
     on update cascade
 ) engine=innodb;
 
-select * from information_schema.innodb_sys_foreign;
-select * from information_schema.innodb_sys_foreign_cols;
-
 insert into parent (value) values (23);
 --enable_prepare_warnings
 select id, value from parent into @id, @value;