summaryrefslogtreecommitdiff
path: root/mysql-test/main/fulltext.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/main/fulltext.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/main/fulltext.result')
-rw-r--r--mysql-test/main/fulltext.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/fulltext.result b/mysql-test/main/fulltext.result
index dbc08144e30..dba1789dd4d 100644
--- a/mysql-test/main/fulltext.result
+++ b/mysql-test/main/fulltext.result
@@ -252,7 +252,7 @@ t2 CREATE TABLE `t2` (
`inhalt` text DEFAULT NULL,
KEY `tig` (`ticket`),
FULLTEXT KEY `tix` (`inhalt`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t2 where MATCH inhalt AGAINST (NULL);
ticket inhalt
select * from t2 where MATCH inhalt AGAINST ('foobar');
@@ -457,7 +457,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(10000) DEFAULT NULL,
FULLTEXT KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
DROP TABLE t1;
CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));
INSERT INTO t1 VALUES('test'),('test1'),('test');