diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 16:20:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 16:20:13 +0200 |
| commit | 77103e98329b51667e124b8861ff6a8b77e25cbb (patch) | |
| tree | 34f004ea6469148846d904b6968420b3a4515db1 /mysql-test/suite/innodb_fts | |
| parent | 723ffdb32ee785cbc511abc457eb70d41c2fcce3 (diff) | |
| parent | c155946c90307ba448af8b4b5161f35b8af9d31d (diff) | |
| download | mariadb-git-77103e98329b51667e124b8861ff6a8b77e25cbb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/innodb_fts')
| -rw-r--r-- | mysql-test/suite/innodb_fts/r/fulltext3.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/fulltext3.test | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb_fts/r/fulltext3.result b/mysql-test/suite/innodb_fts/r/fulltext3.result index 98fd91a072c..8d89cb74bfd 100644 --- a/mysql-test/suite/innodb_fts/r/fulltext3.result +++ b/mysql-test/suite/innodb_fts/r/fulltext3.result @@ -7,3 +7,12 @@ DROP TABLE t1; CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci, FULLTEXT(a)) ENGINE=<default_engine>; DROP TABLE t1; +CREATE TABLE t1 (a SERIAL, t TEXT, FULLTEXT f1(t), FULLTEXT f2(t)) ENGINE=InnoDB; +Warnings: +Note 1831 Duplicate index `f2`. This is deprecated and will be disallowed in a future release +INSERT INTO t1 (a,t) VALUES (1,'1'),(2,'1'); +ALTER TABLE t1 ADD COLUMN g TEXT GENERATED ALWAYS AS (t) VIRTUAL; +DELETE FROM t1 WHERE a = 1; +ALTER TABLE t1 DROP INDEX f1; +INSERT INTO t1 (a,t) VALUES (1,'1'); +DROP TABLE t1; diff --git a/mysql-test/suite/innodb_fts/t/fulltext3.test b/mysql-test/suite/innodb_fts/t/fulltext3.test index 11e6e1af734..9c7941d7b5c 100644 --- a/mysql-test/suite/innodb_fts/t/fulltext3.test +++ b/mysql-test/suite/innodb_fts/t/fulltext3.test @@ -35,3 +35,12 @@ FULLTEXT(a)) ENGINE=$default_engine; DROP TABLE t1; # End of 5.1 tests + + +CREATE TABLE t1 (a SERIAL, t TEXT, FULLTEXT f1(t), FULLTEXT f2(t)) ENGINE=InnoDB; +INSERT INTO t1 (a,t) VALUES (1,'1'),(2,'1'); +ALTER TABLE t1 ADD COLUMN g TEXT GENERATED ALWAYS AS (t) VIRTUAL; +DELETE FROM t1 WHERE a = 1; +ALTER TABLE t1 DROP INDEX f1; +INSERT INTO t1 (a,t) VALUES (1,'1'); +DROP TABLE t1; |