summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/ps_maria.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-09-14 15:00:09 +0400
committerAlexander Barkov <bar@mariadb.com>2022-09-14 16:24:51 +0400
commitfe844c16b6cbd67386d1b9fc1cb9e5a656bbb885 (patch)
tree0bd937aed2faa10b09c0b47884dad4a8e1d5d57c /mysql-test/suite/maria/ps_maria.result
parentfb70bb44d096f4117e9454740aa4fa0651a1a69e (diff)
parent289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff)
downloadmariadb-git-fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885.tar.gz
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysql-test/suite/maria/ps_maria.result')
-rw-r--r--mysql-test/suite/maria/ps_maria.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
index 6f5d557569b..5c128a32dd1 100644
--- a/mysql-test/suite/maria/ps_maria.result
+++ b/mysql-test/suite/maria/ps_maria.result
@@ -1805,7 +1805,7 @@ t5 CREATE TABLE `t5` (
`param13` decimal(65,38) DEFAULT NULL,
`param14` longtext DEFAULT NULL,
`param15` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t5 ;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def test t5 t5 const01 const01 3 1 1 N 36865 0 63