diff --git a/mysql-test/suite/gcol/r/innodb_virtual_basic.result b/mysql-test/suite/gcol/r/innodb_virtual_basic.result index 0c8880a4799..e886559a06c 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_basic.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_basic.result @@ -895,8 +895,6 @@ DROP TABLE t; CREATE TABLE t(a TEXT CHARSET UTF8)ENGINE=INNODB; ALTER TABLE t ADD COLUMN b BLOB GENERATED ALWAYS AS (a) VIRTUAL ; ALTER TABLE t ADD FULLTEXT INDEX (a) ; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ALTER TABLE t ADD INDEX (b(1)) ; DROP TABLE t; CREATE TABLE t(a TEXT CHARSET UTF8, FULLTEXT INDEX(a))ENGINE=INNODB; diff --git a/mysql-test/suite/gcol/r/innodb_virtual_index.result b/mysql-test/suite/gcol/r/innodb_virtual_index.result index b1f7976c6c0..df9985f88e3 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_index.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_index.result @@ -119,8 +119,6 @@ FULLTEXT KEY `ftsic` (`c`,`b`) Warnings: Note 1831 Duplicate index `vbidxcol_2`. This is deprecated and will be disallowed in a future release ALTER TABLE ibstd_08 ADD COLUMN nc07006 BIGINT AUTO_INCREMENT NOT NULL , ADD KEY auto_nc07006(nc07006); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID DROP TABLE ibstd_08; # # Bug 22899305 - GCOLS: FAILING ASSERTION: !(COL->PRTYPE & 256) @@ -183,8 +181,6 @@ ALTER TABLE t1 ADD COLUMN col7a INT GENERATED ALWAYS AS (col5x % col6x) VIRTUAL, ADD FULLTEXT KEY ftidx ( col9 ), algorithm=inplace; ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: INPLACE ADD or DROP of virtual columns cannot be combined with other ALTER TABLE actions. Try ALGORITHM=COPY CREATE FULLTEXT INDEX idx ON t1(col9); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ALTER TABLE t1 ADD COLUMN col7a INT GENERATED ALWAYS AS (col5x % col6x) VIRTUAL, ADD FULLTEXT KEY ftidx ( col9 ), algorithm=inplace; DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/innodb-alter.result b/mysql-test/suite/innodb/r/innodb-alter.result index de69845dddb..dd6b225b79f 100644 --- a/mysql-test/suite/innodb/r/innodb-alter.result +++ b/mysql-test/suite/innodb/r/innodb-alter.result @@ -419,8 +419,6 @@ ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation require ALTER TABLE t1 ADD FULLTEXT INDEX (ct), CHANGE c1 pk INT, ALTER c2 SET DEFAULT 42, RENAME TO tt, ALGORITHM=INPLACE, LOCK=SHARED; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT i.NAME,i.POS,i.MTYPE,i.PRTYPE,i.LEN FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS i INNER JOIN sys_tables st ON i.TABLE_ID=st.TABLE_ID; @@ -485,8 +483,6 @@ ALTER TABLE t1o DROP COLUMN FTS_DOC_ID, ALGORITHM=INPLACE; ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot drop or rename FTS_DOC_ID. Try ALGORITHM=COPY ALTER TABLE t1o DROP COLUMN FTS_DOC_ID, DROP INDEX ct, ALGORITHM=INPLACE; ALTER TABLE t1o ADD FULLTEXT INDEX(ct), ADD COLUMN cu TEXT; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ALTER TABLE t1o ADD FULLTEXT INDEX(cu), ADD COLUMN FTS_DOC_ID BIGINT, ALGORITHM=INPLACE; ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY @@ -702,8 +698,6 @@ FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE name LIKE '%FTS_%' ORDER BY 1, 2; prefix name ALTER TABLE t ADD FULLTEXT INDEX(t); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT sc.pos, sc.NAME FROM information_schema.innodb_sys_columns sc INNER JOIN information_schema.innodb_sys_tables st ON sc.TABLE_ID=st.TABLE_ID diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result index aa79383dde2..daa3ffc0a9f 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result +++ b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result @@ -700,8 +700,6 @@ ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation require ALTER TABLE t1 ADD FULLTEXT INDEX (ct), CHANGE c1 pk INT, ALTER c2 SET DEFAULT 42, RENAME TO tt, ALGORITHM=INPLACE, LOCK=SHARED; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ### files in MYSQL_DATA_DIR/test FTS_AUX_INDEX_1.isl FTS_AUX_INDEX_2.isl @@ -786,8 +784,6 @@ ALGORITHM=INPLACE; ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot change column type INPLACE. Try ALGORITHM=COPY CREATE TABLE t1n LIKE t1o; ALTER TABLE t1n ADD FULLTEXT INDEX(ct); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ### files in MYSQL_DATA_DIR/test FTS_AUX_INDEX_1.isl FTS_AUX_INDEX_2.isl diff --git a/mysql-test/suite/innodb_fts/r/create.result b/mysql-test/suite/innodb_fts/r/create.result index 615f0368599..f3650fb3dc9 100644 --- a/mysql-test/suite/innodb_fts/r/create.result +++ b/mysql-test/suite/innodb_fts/r/create.result @@ -9,8 +9,6 @@ INSERT INTO t SET t=REPEAT(_utf8 0xefbc90,84); INSERT INTO t SET t=REPEAT('befor',17); INSERT INTO t SET t='BeforeTheIndexCreation'; CREATE FULLTEXT INDEX ft ON t(t); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t SET t='this was inserted after creating the index'; INSERT INTO t SET t=REPEAT(_utf8 0xefbc91,84); INSERT INTO t SET t=REPEAT('after',17); @@ -90,8 +88,6 @@ INSERT INTO t SET t=REPEAT(_utf8 0xefbc90,84); INSERT INTO t SET t=REPEAT('befor',17); INSERT INTO t SET t='BeforeTheIndexCreation'; CREATE FULLTEXT INDEX ft ON t(t); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t SET t='this was inserted after creating the index'; INSERT INTO t SET t=REPEAT(_utf8 0xefbc91,84); INSERT INTO t SET t=REPEAT('after',17); diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result index fcf196a0631..0e30dd0be05 100644 --- a/mysql-test/suite/innodb_fts/r/fulltext.result +++ b/mysql-test/suite/innodb_fts/r/fulltext.result @@ -277,8 +277,6 @@ PRIMARY KEY (id), KEY ind5 (title) ) ENGINE = InnoDB; CREATE FULLTEXT INDEX ft1 ON t1(title); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID insert into t1 (title) values ('this is a test'); select * from t1 where match title against ('test' in boolean mode); id title diff --git a/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result b/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result index c5c549f67a1..6ee5f9f4322 100644 --- a/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result +++ b/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result @@ -13,8 +13,6 @@ INSERT INTO fts_test (title,body) VALUES ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY; ERROR 0A000: ALGORITHM=NOCOPY is not supported for this operation. Try ALGORITHM=INPLACE ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=INPLACE; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM fts_test WHERE MATCH (title, body) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); id title body @@ -218,13 +216,9 @@ INSERT INTO articles VALUES (5, 'MySQL vs. YourSQL','In the following database comparison ...'), (6, 'MySQL Security','When configured properly, MySQL ...'); CREATE FULLTEXT INDEX idx on articles (title, body); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID DROP INDEX idx ON articles; CREATE UNIQUE INDEX idx2 ON articles(id); CREATE FULLTEXT INDEX idx on articles (title, body); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM articles WHERE MATCH (title, body) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); id title body diff --git a/mysql-test/suite/innodb_fts/r/innodb-fts-fic.result b/mysql-test/suite/innodb_fts/r/innodb-fts-fic.result index 731abad9198..36d3826be59 100644 --- a/mysql-test/suite/innodb_fts/r/innodb-fts-fic.result +++ b/mysql-test/suite/innodb_fts/r/innodb-fts-fic.result @@ -13,8 +13,6 @@ INSERT INTO articles (title,body) VALUES ('MySQL vs. YourSQL','In the following database comparison ...'), ('MySQL Security','When configured properly, MySQL ...'); CREATE FULLTEXT INDEX idx on articles (title, body); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM articles WHERE MATCH (title, body) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); id title body @@ -105,8 +103,6 @@ INSERT INTO articles (title,body) VALUES ('MySQL vs. YourSQL','In the following database comparison ...'), ('MySQL Security','When configured properly, MySQL ...'); CREATE FULLTEXT INDEX idx on articles (title); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID CREATE FULLTEXT INDEX idx2 on articles (body); SELECT * FROM articles WHERE MATCH (title, body) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result index 74ade61c940..ac8fcd1e26d 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result @@ -9,8 +9,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a ...'), ('Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -161,8 +159,6 @@ a VARCHAR(200), b TEXT ) ENGINE = InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL Tutorial','DBMS stands for DataBase ...') , ('How To Use MySQL Well','After you went through a ...'), @@ -340,8 +336,6 @@ a VARCHAR(200), b TEXT ) ENGINE = InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...'); INSERT INTO t1 (a,b) VALUES @@ -420,8 +414,6 @@ set names utf8; "----------Test1---------" create table t50 (s1 varchar(60) character set utf8 collate utf8_bin) engine = innodb; create fulltext index i on t50 (s1); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID insert into t50 values ('ABCDE'),('FGHIJ'),('KLMNO'),('VÐƷWİ'); select * from t50 where match(s1) against ('VÐƷWİ'); s1 @@ -431,8 +423,6 @@ drop table t50; create table t50 (s1 int unsigned primary key auto_increment, s2 varchar(60) character set utf8) engine = innodb; create fulltext index i on t50 (s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID insert into t50 (s2) values ('FGHIJ'),('KLMNO'),('VÐƷWİ'),('ABCDE'); select * from t50 order by s2; s1 s2 @@ -445,8 +435,6 @@ drop table t50; create table t50 (id int unsigned primary key auto_increment, s2 varchar(60) character set utf8) engine = innodb; create fulltext index i on t50 (s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID insert into t50 (s2) values ('FGHIJ'),('KLMNO'),('VÐƷWİ'),('ABCDE'); set @@autocommit=0; update t50 set s2 = lower(s2); @@ -470,8 +458,6 @@ set @@autocommit=1; create table t50 (id int unsigned primary key auto_increment, s2 varchar(60) character set utf8) engine = innodb; create fulltext index i on t50 (s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID insert into t50 (s2) values ('FGHIJ'),('KLMNO'),('VÐƷWİ'),('ABCD*'); select * from t50 where match(s2) against ('abcd*' in natural language mode); @@ -507,8 +493,6 @@ INSERT INTO t1 (a,b) VALUES ('aab MySQL vs. YourSQL','In the following database comparison ...'), ('aaa MySQL Security','When configured properly, MySQL ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM t1 ORDER BY MATCH(a,b) AGAINST ('aac') DESC; id a b 3 aac Optimizing MySQL In this tutorial we will show ... @@ -556,8 +540,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a q ...abdd'), ('Optimizing MySQL','In this tutorial we will show ...abed'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -637,8 +619,6 @@ DROP TABLE t2,t1; set names utf8; CREATE TABLE t1 (s1 INT, s2 VARCHAR(200) CHARACTER SET UTF8 COLLATE UTF8_SPANISH_CI) ENGINE = InnoDB; CREATE FULLTEXT INDEX i ON t1 (s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 VALUES (1,'aaCen'),(2,'aaCha'),(3,'aaCio'),(4,'aaçen'),(5,'aaçha'),(6,'aaçio'); SELECT * FROM t1 WHERE MATCH(s2) AGAINST ('aach*' IN BOOLEAN MODE); s1 s2 @@ -656,8 +636,6 @@ DROP TABLE t1; "----------Test14---------" CREATE TABLE t1(s1 INT , s2 VARCHAR(100) CHARACTER SET sjis) ENGINE = InnoDB; CREATE FULLTEXT INDEX i ON t1 (s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 VALUES (1,'ペペペ'),(2,'テテテ'),(3,'ルルル'),(4,'グググ'); DROP TABLE t1; "----------Test15---------" @@ -675,8 +653,6 @@ Warnings: Note 1051 Unknown table 'test.t2' CREATE TABLE t2 (s1 VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_POLISH_CI) ENGINE = InnoDB; CREATE FULLTEXT INDEX i ON t2 ( s1); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t2 VALUES ('a'),('b'),('c'),('d'),('ŁŁŁŁ'),('LLLL'),(NULL),('ŁŁŁŁ ŁŁŁŁ'),('LLLLLLLL'); SELECT * FROM t2 WHERE MATCH(s1) AGAINST ('LLLL' COLLATE UTF8_UNICODE_520_CI); @@ -686,8 +662,6 @@ DROP TABLE t1,t2; "----------Test16---------" CREATE TABLE t1 (s1 INT, s2 VARCHAR(50) CHARACTER SET UTF8) ENGINE = InnoDB; CREATE FULLTEXT INDEX i ON t1(s2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 VALUES (2, 'ğė Daśi p '); SELECT * FROM t1 WHERE MATCH(s2) AGAINST ('+p +"ğė Daśi*"' IN BOOLEAN MODE); s1 s2 @@ -696,8 +670,6 @@ DROP TABLE t1; CREATE TABLE t1 ( id INT , char_column VARCHAR(60) CHARACTER SET UTF8) ENGINE = InnoDB; INSERT INTO t1 VALUES (1,'İóëɠ'); CREATE FULLTEXT INDEX i ON t1 (char_column); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM t1 WHERE MATCH(char_column) AGAINST ('"İóëɠ"' IN BOOLEAN MODE); id char_column 1 İóëɠ @@ -707,8 +679,6 @@ CREATE TABLE t1 ( id INT , char_column VARCHAR(60) CHARACTER SET UTF32, char_col INSERT INTO t1 (char_column) VALUES ('abcde'),('fghij'),('klmno'),('qrstu'); UPDATE t1 SET char_column2 = char_column; CREATE FULLTEXT INDEX i ON t1 (char_column2); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM t1 WHERE MATCH(char_column) AGAINST ('abc*' IN BOOLEAN MODE); ERROR HY000: Can't find FULLTEXT index matching the column list DROP TABLE t1; @@ -716,8 +686,6 @@ DROP TABLE t1; CREATE TABLE t1 ( id INT , char_column VARCHAR(60) CHARACTER SET UTF8) ENGINE = InnoDB; INSERT INTO t1 VALUES (1,'aaa'),(2,'bbb'),(3,'ccc'); CREATE FULLTEXT INDEX i ON t1 (char_column); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID HANDLER t1 OPEN; HANDLER t1 READ i = ('aaa'); id char_column @@ -726,8 +694,6 @@ DROP TABLE t1; CREATE TABLE t1 ( id INT , char_column VARCHAR(60) CHARACTER SET UTF8 COLLATE UTF8_CROATIAN_CI) ENGINE=InnoDB; INSERT INTO t1 VALUES (1,'LJin'),(2,'ljin'),(3,'lmin'),(4,'LJLJLJLJLJ'); CREATE FULLTEXT INDEX i ON t1 (char_column); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT count(*) FROM t1 WHERE MATCH (char_column) AGAINST ('lj*' IN BOOLEAN MODE); count(*) 3 @@ -962,8 +928,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a ...'), ('Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -1037,8 +1001,6 @@ INSERT INTO t1 VALUES (2, 'How To Use MySQL Well','After you went through a ...'), (3, 'Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ALTER TABLE t1 ADD UNIQUE INDEX (`id`); SELECT id FROM t1 WHERE MATCH (a,b) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); @@ -1069,8 +1031,6 @@ INSERT INTO t1 VALUES (2, 'How To Use MySQL Well','After you went through a ...'), (3, 'Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD UNIQUE INDEX (`id`), ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT id FROM t1 WHERE MATCH (a,b) AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE); id @@ -1164,8 +1124,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a ...'), ('Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID COMMIT WORK AND CHAIN; INSERT INTO t1 (a,b) VALUES ('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'), diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result index b76784d4ffd..aec3d7f777d 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result @@ -473,8 +473,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a ...'), ('Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -666,8 +664,6 @@ INSERT INTO t1 (a,b) VALUES ('Trial version','query performace @1255 minute on 2.1Hz Memory 2GB...') , ('when To Use MySQL Well','for free faq mail@xyz.com ...'); CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM t1 WHERE MATCH(a,b) AGAINST ("вредит χωρὶς") ORDER BY id; id a b 1 Я могу есть стекло оно мне не вредит diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_multiple_index.result b/mysql-test/suite/innodb_fts/r/innodb_fts_multiple_index.result index b0f7d7727d6..a6dfc2d4b4a 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_multiple_index.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_multiple_index.result @@ -9,8 +9,6 @@ INSERT INTO t1 (a,b) VALUES ('How To Use MySQL Well','After you went through a ...'), ('Optimizing MySQL','In this tutorial we will show ...'); ALTER TABLE t1 ADD FULLTEXT INDEX idx_1 (a); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID ALTER TABLE t1 ADD FULLTEXT INDEX idx_2 (b); SHOW CREATE TABLE t1; Table Create Table 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 b7688e9ef0f..dc71156b7a1 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_plugin.result @@ -67,8 +67,6 @@ INSERT INTO articles (title, body) VALUES ('1001 MySQL Tricks','How to use full-text search engine'), ('Go MySQL Tricks','How to use full text search engine'); ALTER TABLE articles ADD FULLTEXT INDEX (title, body) WITH PARSER simple_parser; -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM articles WHERE MATCH(title, body) AGAINST('mysql'); id title body diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result b/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result index ca9a57dc3e7..d67981e0851 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result @@ -5,8 +5,6 @@ a VARCHAR(200), b TEXT ) ENGINE= InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...') , ('when To Use MySQL Well','After that you went through a ...'), @@ -111,8 +109,6 @@ INSERT INTO t1 (a,b) VALUES ('when To Use MySQL Well','After that you went through a ...'), ('where will Optimizing MySQL','what In this tutorial we will show ...'); CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL Tutorial','request docteam@oraclehelp.com ...') , ('Trial version','query performace @1255 minute on 2.1Hz Memory 2GB...'), @@ -148,8 +144,6 @@ INSERT INTO t1 (a,b,c) VALUES (repeat("b", 19000), 'XYZ, long text', 'very lon INSERT INTO t1 (a,b,c) VALUES (repeat("b", 19000), 'XYZ, very little long blob very much blob', 'very long blob'); INSERT INTO t1 (a,b,c) VALUES (repeat("b", 19000),"very 租车 供 blob","new 供需分析information"); CREATE FULLTEXT INDEX idx on t1 (a,b,c); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b,c) VALUES (repeat("x", 19000), 'new, long text', 'very new blob'); INSERT INTO t1 (a,b,c) VALUES ('interesting, long text', repeat("x", 19000), 'very very good new blob'); SELECT count(*) FROM t1 @@ -191,8 +185,6 @@ b TEXT INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for + DataBase ...'); CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID SELECT * FROM t1 WHERE MATCH (a,b) AGAINST ('"stands database"@3' IN BOOLEAN MODE); @@ -208,8 +200,6 @@ c TEXT INSERT INTO t1 (a,b,c) VALUES (repeat("b", 19000), 'XYZ, long text', 'very long blob'); INSERT INTO t1 (a,b,c) VALUES ('XYZ, 租车 very little long blob very much blob', repeat("b", 19000), 'very long but smaller blob'); CREATE FULLTEXT INDEX idx on t1 (a,b,c); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID DELETE FROM t1; INSERT INTO t1 (a,b,c) VALUES (repeat("b", 19000), 'XYZ, long text', 'very long blob'); INSERT INTO t1 (a,b,c) VALUES ('XYZ, 租车 very little long blob is a very much longer blob', repeat("b", 19000), 'this is very long but smaller blob'); diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result b/mysql-test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result index 40a38e62a1e..61eb5294463 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result @@ -4,8 +4,6 @@ a VARCHAR(200), b TEXT ) ENGINE= InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...') , ('when To Use MySQL Well','After that you went through a ...'), diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result b/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result index 6f5409f63cd..fc6a1d1afe7 100644 --- a/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result +++ b/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result @@ -5,8 +5,6 @@ a VARCHAR(200), b TEXT ) ENGINE = InnoDB STATS_PERSISTENT=0; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...') , ('when To Use MySQL Well','After that you went through a ...'), @@ -128,8 +126,6 @@ a VARCHAR(200), b TEXT ) ENGINE = InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...') , ('when To Use MySQL Well','After that you went through a ...'), @@ -241,8 +237,6 @@ a VARCHAR(200), b TEXT ) ENGINE = InnoDB; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('MySQL from Tutorial','DBMS stands for DataBase ...') , ('when To Use MySQL Well','After that you went through a ...'), @@ -328,8 +322,6 @@ INSERT INTO t1 (a,b) VALUES connect con2,localhost,root,,; SET NAMES UTF8; CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID connection con1; SELECT * FROM t1 WHERE MATCH (a,b) @@ -546,8 +538,6 @@ select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('adding record using session 1','for verifying multiple concurrent transactions'), ('Мога да ям стъкло', 'то Mне ми вреди'); @@ -663,8 +653,6 @@ select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('adding record using session 1','for verifying multiple concurrent transactions'), ('Мога да ям стъкло', 'то Mне ми вреди'); @@ -810,8 +798,6 @@ select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('adding record using session 1','for verifying multiple concurrent transactions'), ('Мога да ям стъкло', 'то Mне ми вреди'); @@ -932,8 +918,6 @@ select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ CREATE FULLTEXT INDEX idx on t1 (a,b); -Warnings: -Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID INSERT INTO t1 (a,b) VALUES ('adding record using session 1','for verifying multiple concurrent transactions'), ('Мога да ям стъкло', 'то Mне ми вреди'); diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 19da290e59f..66ca762ccce 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -6871,13 +6871,6 @@ err_exit: add_fts_doc_id = true; add_fts_doc_id_idx = true; - push_warning_printf( - m_user_thd, - Sql_condition::WARN_LEVEL_WARN, - HA_ERR_WRONG_INDEX, - "InnoDB rebuilding table to add" - " column " FTS_DOC_ID_COL_NAME); - } else if (fts_doc_col_no == ULINT_UNDEFINED) { goto err_exit; }