diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-13 16:36:38 +0300 |
commit | 18795f55122b04cb5c9ea19498b720735b80714b (patch) | |
tree | 1a749eeaaabaa86e9b755cef817a6267a6b59960 /mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result | |
parent | 9a8faeea142ea6f575419799c9439f4673971573 (diff) | |
parent | 68ce0231ad6a16e02db9d67a217a88055b6d01ff (diff) | |
download | mariadb-git-18795f55122b04cb5c9ea19498b720735b80714b.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result')
-rw-r--r-- | mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result index 2ed1f917ca6..bb0fb7bbf0b 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result @@ -87,7 +87,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) GENERATED ALWAYS AS (`a` + `b`) VIRTUAL, KEY `idx` (`c`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a b c 2 2 4 @@ -127,7 +127,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) GENERATED ALWAYS AS (`a` + `b`) VIRTUAL, KEY `idx` (`c`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a b c 2 2 4 |