summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-07-20 09:32:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-07-20 09:32:11 +0300
commitb4ec3313f6bb3a222b3528b5a8a6dca73b870c20 (patch)
tree5f94e39e8dd20f895916a5db7562d0c11f13a5ab /mysql-test/suite/innodb
parent2916a7e7425f9bab7e58969938d0f8b00de237d2 (diff)
parent3e5a11e4889c97b781bb5828c8eed62251948a9e (diff)
downloadmariadb-git-b4ec3313f6bb3a222b3528b5a8a6dca73b870c20.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/innodb')
-rw-r--r--mysql-test/suite/innodb/r/instant_alter_debug,dynamic.rdiff6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/instant_alter_debug,dynamic.rdiff b/mysql-test/suite/innodb/r/instant_alter_debug,dynamic.rdiff
new file mode 100644
index 00000000000..379514edad9
--- /dev/null
+++ b/mysql-test/suite/innodb/r/instant_alter_debug,dynamic.rdiff
@@ -0,0 +1,6 @@
+@@ -470,4 +470,4 @@
+ FROM information_schema.global_status
+ WHERE variable_name = 'innodb_instant_alter_column';
+ instants
+-33
++32