summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-01-25 13:56:10 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-01-25 13:56:10 +0200
commit0c3d264207dcb720c32fcc19c188abe84994d52b (patch)
treeb4ebcd2a04053248b672d0c1659829110b195db0
parent3467f6376472ce695e36746ba5b3c13cb5fcbb9f (diff)
downloadmariadb-git-0c3d264207dcb720c32fcc19c188abe84994d52b.tar.gz
instant_alter_debug: Cover everything with innodb_instant_alter_column
-rw-r--r--mysql-test/suite/innodb/r/instant_alter_debug.result10
-rw-r--r--mysql-test/suite/innodb/t/instant_alter_debug.test8
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result
index 0fd879f8934..584cf2bbd34 100644
--- a/mysql-test/suite/innodb/r/instant_alter_debug.result
+++ b/mysql-test/suite/innodb/r/instant_alter_debug.result
@@ -381,11 +381,6 @@ a b
1 1
DROP TABLE t1;
SET debug_dbug = @save_dbug;
-SELECT variable_value-@old_instant instants
-FROM information_schema.global_status
-WHERE variable_name = 'innodb_instant_alter_column';
-instants
-28
#
# MDEV-24512 Assertion failed in rec_is_metadata()
# in btr_discard_only_page_on_level()
@@ -402,3 +397,8 @@ c2 c
DROP TABLE t1;
# End of 10.4 tests
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+SELECT variable_value-@old_instant instants
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_instant_alter_column';
+instants
+29
diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test
index 37f3fe023c7..7d4078ecdab 100644
--- a/mysql-test/suite/innodb/t/instant_alter_debug.test
+++ b/mysql-test/suite/innodb/t/instant_alter_debug.test
@@ -430,10 +430,6 @@ DROP TABLE t1;
SET debug_dbug = @save_dbug;
-SELECT variable_value-@old_instant instants
-FROM information_schema.global_status
-WHERE variable_name = 'innodb_instant_alter_column';
-
--echo #
--echo # MDEV-24512 Assertion failed in rec_is_metadata()
--echo # in btr_discard_only_page_on_level()
@@ -453,3 +449,7 @@ DROP TABLE t1;
--echo # End of 10.4 tests
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
+
+SELECT variable_value-@old_instant instants
+FROM information_schema.global_status
+WHERE variable_name = 'innodb_instant_alter_column';