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/main/ansi.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/main/ansi.result')
| -rw-r--r-- | mysql-test/main/ansi.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ansi.result b/mysql-test/main/ansi.result index 810168cc3bd..b1b41f52c1c 100644 --- a/mysql-test/main/ansi.result +++ b/mysql-test/main/ansi.result @@ -23,7 +23,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`i`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SET @@SQL_MODE="MYSQL323"; SHOW CREATE TABLE t1; Table Create Table @@ -44,7 +44,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) NOT NULL, PRIMARY KEY (`i`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # MDEV-16186 Concatenation operator || returns wrong results in sql_mode=ORACLE |