diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/main/mysql.result | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/mysql.result')
| -rw-r--r-- | mysql-test/main/mysql.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result index f2dec7fe1a4..5363bcd12b2 100644 --- a/mysql-test/main/mysql.result +++ b/mysql-test/main/mysql.result @@ -551,12 +551,12 @@ show create table `a1\``b1`; Table Create Table a1\`b1 CREATE TABLE `a1\``b1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `a1\``b1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; INSERT INTO `a1\``b1` VALUES (1),(2); insert `a1\``b1` values (4),(5); @@ -564,7 +564,7 @@ show create table `a1\``b1`; Table Create Table a1\`b1 CREATE TABLE `a1\``b1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from `a1\``b1`; a 1 @@ -580,7 +580,7 @@ show create table "a1\""b1"; Table Create Table a1\"b1 CREATE TABLE "a1\""b1" ( "a" int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE "a1\""b1" ( @@ -593,7 +593,7 @@ show create table "a1\""b1"; Table Create Table a1\"b1 CREATE TABLE "a1\""b1" ( "a" int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from "a1\""b1"; a 1 |