diff options
author | Alexander Barkov <bar@mariadb.com> | 2022-09-14 15:00:09 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2022-09-14 16:24:51 +0400 |
commit | fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885 (patch) | |
tree | 0bd937aed2faa10b09c0b47884dad4a8e1d5d57c /mysql-test/suite/innodb_i_s/innodb_sys_foreign.result | |
parent | fb70bb44d096f4117e9454740aa4fa0651a1a69e (diff) | |
parent | 289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff) | |
download | mariadb-git-fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885.tar.gz |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysql-test/suite/innodb_i_s/innodb_sys_foreign.result')
-rw-r--r-- | mysql-test/suite/innodb_i_s/innodb_sys_foreign.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result index d028b7487ef..7c79e8fd566 100644 --- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result +++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result @@ -6,4 +6,4 @@ INNODB_SYS_FOREIGN CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN` ( `REF_NAME` varchar(193) NOT NULL, `N_COLS` int(11) unsigned NOT NULL, `TYPE` int(11) unsigned NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci |