diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:08:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:12:17 +0200 |
| commit | 44298e4dea39280187c587c6e776ce8d04e350de (patch) | |
| tree | 15f8bac3c985c4f07fd6af066439d046dbb13c35 /mysql-test/suite/innodb_fts | |
| parent | dd68db0c17d674f1b64e70ff7ea9e3f4abe4ee3e (diff) | |
| parent | 9f7b8625e698da6b7eba7c26e765c66635571919 (diff) | |
| download | mariadb-git-44298e4dea39280187c587c6e776ce8d04e350de.tar.gz | |
Merge 10.2 into 10.3
Also, clean up the test innodb_gis.geometry a little further.
Diffstat (limited to 'mysql-test/suite/innodb_fts')
| -rw-r--r-- | mysql-test/suite/innodb_fts/r/sync.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/sync.test | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mysql-test/suite/innodb_fts/r/sync.result b/mysql-test/suite/innodb_fts/r/sync.result index 82959cfea96..4d28866ec82 100644 --- a/mysql-test/suite/innodb_fts/r/sync.result +++ b/mysql-test/suite/innodb_fts/r/sync.result @@ -99,17 +99,17 @@ SET debug_dbug = '+d,fts_instrument_sync_debug,fts_write_node_crash'; INSERT INTO t1(title) VALUES('mysql'); ERROR HY000: Lost connection to MySQL server during query After restart -SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); -FTS_DOC_ID title -1 database +SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); +title +database SET @old_dbug = @@SESSION.debug_dbug; SET debug_dbug = '+d,fts_instrument_sync_debug'; INSERT INTO t1(title) VALUES('mysql'); SET debug_dbug = @old_dbug; -SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); -FTS_DOC_ID title -1 database -2 mysql +SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); +title +database +mysql DROP TABLE t1; # Case 4: Test sync commit & rollback in background CREATE TABLE t1( diff --git a/mysql-test/suite/innodb_fts/t/sync.test b/mysql-test/suite/innodb_fts/t/sync.test index 2ad5423d73b..6929dce31b8 100644 --- a/mysql-test/suite/innodb_fts/t/sync.test +++ b/mysql-test/suite/innodb_fts/t/sync.test @@ -123,7 +123,9 @@ INSERT INTO t1(title) VALUES('mysql'); --source include/start_mysqld.inc -- echo After restart -SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); +# PAGE_ROOT_AUTO_INC could contain last failed autoinc value. Avoid +# doing show the result of auto increment field +SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); SET @old_dbug = @@SESSION.debug_dbug; @@ -133,7 +135,7 @@ INSERT INTO t1(title) VALUES('mysql'); SET debug_dbug = @old_dbug; -SELECT * FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); +SELECT title FROM t1 WHERE MATCH(title) AGAINST ('mysql database'); DROP TABLE t1; |