MDEV-25292 backup_log improved

Separate backup_log_print per each test case group.

4 files changed, 270 insertions, 163 deletions

diff --git a/mysql-test/main/backup_log.inc b/mysql-test/main/backup_log.inc
index f553a3b9527..4ad6b9122cd 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 with normal tables
+--echo # Testing normal tables
 --echo #
 
 eval create table t1 (a int) engine=myisam $part_int;
@@ -20,6 +20,8 @@ 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;
@@ -30,6 +32,8 @@ 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 #
@@ -41,6 +45,8 @@ 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 #
@@ -54,6 +60,8 @@ 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 #
@@ -68,6 +76,8 @@ 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 #
@@ -81,6 +91,8 @@ 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 #
@@ -91,6 +103,8 @@ 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 #
@@ -107,6 +121,8 @@ 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 #
@@ -128,6 +144,8 @@ insert into t71 select * from t70;
 unlock tables;
 drop table t70,t71;
 
+--source backup_log_print.inc
+
 --echo #
 --echo # Testing strange table names
 --echo #
@@ -135,6 +153,8 @@ 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 #
@@ -146,6 +166,8 @@ drop trigger trg;
 drop view v1;
 drop table t80;
 
+--source backup_log_print.inc
+
 --echo #
 --echo # Testing alter to a new storage engine
 --echo #
@@ -153,3 +175,5 @@ 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 2277210f340..9b86c19ae40 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 with normal tables
+# Testing normal tables
 #
 create table t1 (a int) engine=myisam ;
 insert into t1 values (1),(2);
@@ -19,6 +19,16 @@ 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;
@@ -34,6 +44,17 @@ 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;
@@ -43,6 +64,9 @@ 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);
@@ -57,6 +81,13 @@ 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) ;
@@ -71,6 +102,17 @@ 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,,,
+#
 # Testing create LIKE
 #
 create table t40 (a int) engine=myisam ;
@@ -86,6 +128,17 @@ 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) ;
@@ -94,6 +147,18 @@ 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 ;
@@ -107,6 +172,13 @@ 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 ;
@@ -123,11 +195,26 @@ 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 ;
@@ -137,12 +224,27 @@ 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;
@@ -151,6 +253,16 @@ 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;
@@ -159,82 +271,14 @@ 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,,,
-CREATE,MyISAM,0,test,t32,id: 11,,0,,,
-DROP,MyISAM,0,test,t30,id: 8,,0,,,
-DROP,MyISAM,0,test,t31,id: 10,,0,,,
-DROP,MyISAM,0,test,t32,id: 11,,0,,,
-CREATE,MyISAM,0,test,t40,id: 12,,0,,,
-CREATE,InnoDB,0,test,t41,id: 13,,0,,,
-CREATE,MyISAM,0,test,t42,id: 14,,0,,,
-DROP,MyISAM,0,test,t42,id: 14,,0,,,
-CREATE,InnoDB,0,test,t42,id: 15,,0,,,
-DROP,MyISAM,0,test,t40,id: 12,,0,,,
-DROP,InnoDB,0,test,t41,id: 13,,0,,,
-DROP,InnoDB,0,test,t42,id: 15,,0,,,
-CREATE,MyISAM,0,test,t50,id: 16,,0,,,
-CREATE,MyISAM,0,test,t51,id: 17,,0,,,
-RENAME,MyISAM,0,test,t50,id: 16,MyISAM,0,test,t52,id: 16
-RENAME,MyISAM,0,test,t51,id: 17,MyISAM,0,test,t53,id: 17
-RENAME,MyISAM,0,test,t52,id: 16,MyISAM,0,test,tmp,id: 16
-RENAME,MyISAM,0,test,t53,id: 17,MyISAM,0,test,t52,id: 17
-RENAME,MyISAM,0,test,tmp,id: 16,MyISAM,0,test,t53,id: 16
-DROP,MyISAM,0,test,t52,id: 17,,0,,,
-DROP,MyISAM,0,test,t53,id: 16,,0,,,
-CREATE,Aria,0,test,t60,id: 18,,0,,,
-CHANGE_INDEX,Aria,0,test,t60,id: 18,,0,,,
-CHANGE_INDEX,Aria,0,test,t60,id: 18,,0,,,
-DROP,Aria,0,test,t60,id: 18,,0,,,
-CREATE,Aria,0,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,0,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,0,test,t70,id: 19,,0,,,
-CREATE,Aria,0,test,t71,id: 20,,0,,,
-BULK_INSERT,Aria,0,test,t71,id: 20,,0,,,
-DROP,Aria,0,test,t70,id: 19,,0,,,
-DROP,Aria,0,test,t71,id: 20,,0,,,
-CREATE,MyISAM,0,test,t@00201,id: 21,,0,,,
-DROP,MyISAM,0,test,t@00201,id: 21,,0,,,
-CREATE,MyISAM,0,test,t80,id: 22,,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: 22,,0,,,
-CREATE,MyISAM,0,test,t85,id: 23,,0,,,
-ALTER,MyISAM,0,test,t85,id: 23,InnoDB,0,test,t85,id: 24
-DROP,InnoDB,0,test,t85,id: 24,,0,,,
-CREATE,DATABASE,0,mysqltest,,,,0,,,
-CREATE,MyISAM,0,mysqltest,t90,id: 25,,0,,,
-CREATE,InnoDB,0,mysqltest,t91,id: 26,,0,,,
-ALTER,DATABASE,0,mysqltest,,,,0,,,
-DROP,MyISAM,0,mysqltest,t90,id: 25,,0,,,
-DROP,InnoDB,0,mysqltest,t91,id: 26,,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 ee34484e92b..d2f5d4616bd 100644
--- a/mysql-test/main/backup_log.test
+++ b/mysql-test/main/backup_log.test
@@ -24,6 +24,8 @@ 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 #
@@ -36,4 +38,5 @@ 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/suite/parts/r/backup_log.result b/mysql-test/suite/parts/r/backup_log.result
index 1251f846657..df1dd0e4cdb 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 with normal tables
+# Testing normal tables
 #
 create table t1 (a int) engine=myisam PARTITION BY HASH(a) PARTITIONS 2;
 insert into t1 values (1),(2);
@@ -17,6 +17,17 @@ 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;
@@ -32,6 +43,17 @@ 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;
@@ -41,6 +63,9 @@ 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);
@@ -55,6 +80,13 @@ 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;
@@ -69,6 +101,17 @@ 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,,,
+#
 # Testing create LIKE
 #
 create table t40 (a int) engine=myisam PARTITION BY HASH(a) PARTITIONS 2;
@@ -85,6 +128,17 @@ 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;
@@ -93,6 +147,18 @@ 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;
@@ -106,6 +172,13 @@ 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;
@@ -122,11 +195,30 @@ 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;
@@ -136,12 +228,27 @@ 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;
@@ -184,93 +291,22 @@ DROP TABLE t220;
 #
 # 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,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,,,
-CREATE,MyISAM,1,test,t32,id: 11,,0,,,
-DROP,MyISAM,1,test,t30,id: 8,,0,,,
-DROP,MyISAM,0,test,t31,id: 10,,0,,,
-DROP,MyISAM,1,test,t32,id: 11,,0,,,
-CREATE,MyISAM,1,test,t40,id: 12,,0,,,
-CREATE,InnoDB,1,test,t41,id: 13,,0,,,
-CREATE,partition,0,test,t42,id: 14,,0,,,
-DROP,MyISAM,1,test,t42,id: 14,,0,,,
-CREATE,partition,0,test,t42,id: 15,,0,,,
-DROP,MyISAM,1,test,t40,id: 12,,0,,,
-DROP,InnoDB,1,test,t41,id: 13,,0,,,
-DROP,InnoDB,1,test,t42,id: 15,,0,,,
-CREATE,MyISAM,1,test,t50,id: 16,,0,,,
-CREATE,MyISAM,1,test,t51,id: 17,,0,,,
-RENAME,MyISAM,1,test,t50,id: 16,MyISAM,1,test,t52,id: 16
-RENAME,MyISAM,1,test,t51,id: 17,MyISAM,1,test,t53,id: 17
-RENAME,MyISAM,1,test,t52,id: 16,MyISAM,1,test,tmp,id: 16
-RENAME,MyISAM,1,test,t53,id: 17,MyISAM,1,test,t52,id: 17
-RENAME,MyISAM,1,test,tmp,id: 16,MyISAM,1,test,t53,id: 16
-DROP,MyISAM,1,test,t52,id: 17,,0,,,
-DROP,MyISAM,1,test,t53,id: 16,,0,,,
-CREATE,Aria,1,test,t60,id: 18,,0,,,
-CHANGE_INDEX,Aria,1,test,t60,id: 18,,0,,,
-CHANGE_INDEX,Aria,1,test,t60,id: 18,,0,,,
-DROP,Aria,1,test,t60,id: 18,,0,,,
-CREATE,Aria,1,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 19,,0,,,
-TRUNCATE,Aria,1,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 19,,0,,,
-BULK_INSERT,Aria,1,test,t70,id: 19,,0,,,
-CREATE,Aria,1,test,t71,id: 20,,0,,,
-BULK_INSERT,Aria,1,test,t71,id: 20,,0,,,
-BULK_INSERT,Aria,1,test,t71,id: 20,,0,,,
-DROP,Aria,1,test,t70,id: 19,,0,,,
-DROP,Aria,1,test,t71,id: 20,,0,,,
-CREATE,MyISAM,1,test,t@00201,id: 21,,0,,,
-DROP,MyISAM,1,test,t@00201,id: 21,,0,,,
-CREATE,MyISAM,1,test,t80,id: 22,,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: 22,,0,,,
-CREATE,MyISAM,1,test,t85,id: 23,,0,,,
-ALTER,MyISAM,1,test,t85,id: 23,InnoDB,1,test,t85,id: 24
-DROP,InnoDB,1,test,t85,id: 24,,0,,,
-CREATE,Aria,0,test,t200,id: 25,,0,,,
-ALTER,Aria,0,test,t200,id: 25,Aria,1,test,t200,id: 26
-CREATE,Aria,0,test,t210,id: 27,,0,,,
-EXCHANGE_PARTITION,Aria,1,test,t200,id: 26,Aria,0,test,t210,id: 27
-ALTER,Aria,1,test,t200,id: 26,Aria,1,test,t200,id: 28
-ALTER,Aria,1,test,t200,id: 28,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,0,test,t200,id: 35
-DROP,Aria,0,test,t200,id: 35,,0,,,
-DROP,Aria,0,test,t210,id: 27,,0,,,
-CREATE,Aria,1,test,t220,id: 36,,0,,,
-DROP,Aria,1,test,t220,id: 36,,0,,,
+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,,,
 #
 # Cleanup
 #