summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_fts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2016-12-29 15:05:04 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2016-12-29 15:05:04 +0200
commit7bcae22bf196a35435bd297da76a853827edaeb7 (patch)
tree1a334369ee487695221173c27ef71933e64dcbe0 /mysql-test/suite/innodb_fts
parentab89359dde2f8fce2f1b7d233587804f459b9348 (diff)
parent6f4f9f2843d452d29883fe8d136e938980e6b376 (diff)
downloadmariadb-git-7bcae22bf196a35435bd297da76a853827edaeb7.tar.gz
Merge branch 'bb-10.2-mdev-6076' into 10.2
Diffstat (limited to 'mysql-test/suite/innodb_fts')
-rw-r--r--mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
index c7c86290f3c..f057db1d284 100644
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result
@@ -139,8 +139,8 @@ INSERT INTO articles (title, body) VALUES
SELECT * FROM articles WHERE
MATCH(title, body) AGAINST('Tricks');
id title body
-4 1001 MySQL Tricks How to use full-text search engine
-5 Go MySQL Tricks How to use full text search engine
+9 1001 MySQL Tricks How to use full-text search engine
+10 Go MySQL Tricks How to use full text search engine
SELECT COUNT(*) FROM articles;
COUNT(*)
5