Merge branch '10.3' into 10.4

2 files changed, 49 insertions, 3 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result b/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result
index ca373112c1c..d95549be4c1 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/show_table_status.result
@@ -75,7 +75,25 @@ select create_time, update_time into @create_tm, @update_tm
 from information_schema.tables 
 where table_schema=database() and table_name='t1';
 # Then, an in-place ALTER TABLE:
+select sleep(2);
+sleep(2)	0
 alter table t1 add key (a);
+# create_time will change as .frm file is rewritten:
+select
+create_time=@create_tm,
+update_time
+from information_schema.tables 
+where table_schema=database() and table_name='t1';
+create_time=@create_tm	0
+update_time	NULL
+# Check TRUNCATE TABLE
+insert into t1 values (10,10);
+select create_time, update_time into @create_tm, @update_tm
+from information_schema.tables 
+where table_schema=database() and table_name='t1';
+select sleep(2);
+sleep(2)	0
+truncate table t1;
 select
 create_time=@create_tm /* should not change */,
 update_time
@@ -86,13 +104,18 @@ update_time	NULL
 #
 # Check what is left after server restart
 #
+drop table t1;
+create table t1 (a int);
+insert into t1 values (1);
 # Save t1's creation time
 create table t2 as
 select create_time
 from information_schema.tables
 where table_schema=database() and table_name='t1';
+select sleep(2);
+sleep(2)	0
 select
-create_time=(select create_time from t2)  /* should change */,
+create_time=(select create_time from t2)  /* should not change */,
 update_time
 from information_schema.tables
 where table_schema=database() and table_name='t1';
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test b/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test
index 109301a8879..55854710c31 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test
@@ -114,26 +114,49 @@ from information_schema.tables
 where table_schema=database() and table_name='t1';
 
 --echo # Then, an in-place ALTER TABLE:
+select sleep(2);
 alter table t1 add key (a);
 
+--echo # create_time will change as .frm file is rewritten:
+select
+  create_time=@create_tm,
+  update_time
+from information_schema.tables 
+where table_schema=database() and table_name='t1';
+
+--echo # Check TRUNCATE TABLE
+insert into t1 values (10,10);
+select create_time, update_time into @create_tm, @update_tm
+from information_schema.tables 
+where table_schema=database() and table_name='t1';
+
+select sleep(2);
+truncate table t1;
+
 select
   create_time=@create_tm /* should not change */,
   update_time
 from information_schema.tables 
 where table_schema=database() and table_name='t1';
 
+
 --echo #
 --echo # Check what is left after server restart
 --echo #
-
+drop table t1;
+create table t1 (a int);
+insert into t1 values (1);
 --echo # Save t1's creation time
 create table t2 as
 select create_time
 from information_schema.tables
 where table_schema=database() and table_name='t1';
 
+select sleep(2);
+--source include/restart_mysqld.inc
+
 select
-  create_time=(select create_time from t2)  /* should change */,
+  create_time=(select create_time from t2)  /* should not change */,
   update_time
 from information_schema.tables
 where table_schema=database() and table_name='t1';