mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge 10.11 into 11.0
This commit is contained in:
Marko Mäkelä
11
mysql-test/suite/innodb_fts/r/create,orig.rdiff
Normal file
11
mysql-test/suite/innodb_fts/r/create,orig.rdiff
Normal file
@@ -0,0 +1,11 @@
|
||||
--- create.result
|
||||
+++ create.reject
|
||||
@@ -207,7 +207,7 @@
|
||||
UNIQUE KEY `FTS_DOC_ID_INDEX` (`FTS_DOC_ID` DESC)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
||||
ALTER TABLE t1 ADD FULLTEXT INDEX(b), ALGORITHM=INPLACE;
|
||||
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
+ERROR HY000: Index 'FTS_DOC_ID_INDEX' is of wrong type for an InnoDB FULLTEXT index
|
||||
ALTER TABLE t1 ADD FULLTEXT INDEX(b), ALGORITHM=COPY;
|
||||
ERROR HY000: Index 'FTS_DOC_ID_INDEX' is of wrong type for an InnoDB FULLTEXT index
|
||||
DROP TABLE t1;
|
||||
@@ -207,7 +207,7 @@ t1 CREATE TABLE `t1` (
|
||||
UNIQUE KEY `FTS_DOC_ID_INDEX` (`FTS_DOC_ID` DESC)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
|
||||
ALTER TABLE t1 ADD FULLTEXT INDEX(b), ALGORITHM=INPLACE;
|
||||
ERROR HY000: Index 'FTS_DOC_ID_INDEX' is of wrong type for an InnoDB FULLTEXT index
|
||||
ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
ALTER TABLE t1 ADD FULLTEXT INDEX(b), ALGORITHM=COPY;
|
||||
ERROR HY000: Index 'FTS_DOC_ID_INDEX' is of wrong type for an InnoDB FULLTEXT index
|
||||
DROP TABLE t1;
|
||||
|
||||
57
mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers.rdiff
Normal file
57
mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers.rdiff
Normal file
@@ -0,0 +1,57 @@
|
||||
--- innodb-fts-ddl.result
|
||||
+++ innodb-fts-ddl.reject
|
||||
@@ -11,8 +11,10 @@
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
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;
|
||||
+ERROR 0A000: ALGORITHM=NOCOPY is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 6
|
||||
+info: Records: 6 Duplicates: 0 Warnings: 0
|
||||
SELECT * FROM fts_test WHERE MATCH (title, body)
|
||||
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
|
||||
id title body
|
||||
@@ -26,7 +28,9 @@
|
||||
('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
-ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 12
|
||||
+info: Records: 12 Duplicates: 0 Warnings: 0
|
||||
SELECT * FROM fts_test WHERE MATCH (title, body)
|
||||
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
|
||||
id title body
|
||||
@@ -76,8 +80,10 @@
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
|
||||
-ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
|
||||
-ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
|
||||
+ERROR 0A000: LOCK=NONE is not supported. Reason: Not implemented for system-versioned operations. Try LOCK=SHARED
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 6
|
||||
+info: Records: 6 Duplicates: 0 Warnings: 0
|
||||
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
|
||||
ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
|
||||
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
|
||||
@@ -162,7 +168,7 @@
|
||||
(20, 'MySQL Security','When configured properly, MySQL ...');
|
||||
ALTER TABLE articles ADD FULLTEXT INDEX idx (title),
|
||||
ADD FULLTEXT INDEX idx3 (title), ALGORITHM=INPLACE;
|
||||
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
ALTER TABLE articles ADD FULLTEXT INDEX idx (title),
|
||||
ADD FULLTEXT INDEX idx3 (title);
|
||||
affected rows: 6
|
||||
@@ -274,7 +280,7 @@
|
||||
call mtr.add_suppression("InnoDB: Failed to create");
|
||||
CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
|
||||
ALTER TABLE t1 ADD FULLTEXT(a), ALGORITHM=INPLACE;
|
||||
-ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB;
|
||||
ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b);
|
||||
57
mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers_trx.rdiff
Normal file
57
mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers_trx.rdiff
Normal file
@@ -0,0 +1,57 @@
|
||||
--- innodb-fts-ddl.result
|
||||
+++ innodb-fts-ddl.reject
|
||||
@@ -11,8 +11,10 @@
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
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;
|
||||
+ERROR 0A000: ALGORITHM=NOCOPY is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 6
|
||||
+info: Records: 6 Duplicates: 0 Warnings: 0
|
||||
SELECT * FROM fts_test WHERE MATCH (title, body)
|
||||
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
|
||||
id title body
|
||||
@@ -26,7 +28,9 @@
|
||||
('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
-ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 12
|
||||
+info: Records: 12 Duplicates: 0 Warnings: 0
|
||||
SELECT * FROM fts_test WHERE MATCH (title, body)
|
||||
AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);
|
||||
id title body
|
||||
@@ -76,8 +80,10 @@
|
||||
('MySQL vs. YourSQL','In the following database comparison ...'),
|
||||
('MySQL Security','When configured properly, MySQL ...');
|
||||
CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
|
||||
-ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
|
||||
-ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
|
||||
+ERROR 0A000: LOCK=NONE is not supported. Reason: Not implemented for system-versioned operations. Try LOCK=SHARED
|
||||
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
|
||||
+affected rows: 6
|
||||
+info: Records: 6 Duplicates: 0 Warnings: 0
|
||||
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
|
||||
ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
|
||||
ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
|
||||
@@ -162,7 +168,7 @@
|
||||
(20, 'MySQL Security','When configured properly, MySQL ...');
|
||||
ALTER TABLE articles ADD FULLTEXT INDEX idx (title),
|
||||
ADD FULLTEXT INDEX idx3 (title), ALGORITHM=INPLACE;
|
||||
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
ALTER TABLE articles ADD FULLTEXT INDEX idx (title),
|
||||
ADD FULLTEXT INDEX idx3 (title);
|
||||
affected rows: 6
|
||||
@@ -274,7 +280,7 @@
|
||||
call mtr.add_suppression("InnoDB: Failed to create");
|
||||
CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
|
||||
ALTER TABLE t1 ADD FULLTEXT(a), ALGORITHM=INPLACE;
|
||||
-ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (a VARCHAR(3)) ENGINE=InnoDB;
|
||||
ALTER TABLE t1 ADD FULLTEXT KEY(a), ADD COLUMN b VARCHAR(3), ADD FULLTEXT KEY(b);
|
||||
10
mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers.rdiff
Normal file
10
mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers.rdiff
Normal file
@@ -0,0 +1,10 @@
|
||||
--- innodb-fts-fic.result
|
||||
+++ innodb-fts-fic.reject
|
||||
@@ -172,7 +172,6 @@
|
||||
(1, 'MySQL Tutorial','DBMS stands for DataBase ...'),
|
||||
(2, 'How To Use MySQL Well','After you went through a ...');
|
||||
CREATE FULLTEXT INDEX idx ON wp(title, text);
|
||||
-ERROR HY000: Column 'FTS_DOC_ID' is of wrong type for an InnoDB FULLTEXT index
|
||||
DROP TABLE wp;
|
||||
CREATE TABLE wp(
|
||||
FTS_DOC_ID bigint unsigned PRIMARY KEY,
|
||||
10
mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers_trx.rdiff
Normal file
10
mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers_trx.rdiff
Normal file
@@ -0,0 +1,10 @@
|
||||
--- innodb-fts-fic.result
|
||||
+++ innodb-fts-fic.reject
|
||||
@@ -172,7 +172,6 @@
|
||||
(1, 'MySQL Tutorial','DBMS stands for DataBase ...'),
|
||||
(2, 'How To Use MySQL Well','After you went through a ...');
|
||||
CREATE FULLTEXT INDEX idx ON wp(title, text);
|
||||
-ERROR HY000: Column 'FTS_DOC_ID' is of wrong type for an InnoDB FULLTEXT index
|
||||
DROP TABLE wp;
|
||||
CREATE TABLE wp(
|
||||
FTS_DOC_ID bigint unsigned PRIMARY KEY,
|
||||
66
mysql-test/suite/innodb_fts/r/misc_debug,vers.rdiff
Normal file
66
mysql-test/suite/innodb_fts/r/misc_debug,vers.rdiff
Normal file
@@ -0,0 +1,66 @@
|
||||
--- misc_debug.result
|
||||
+++ misc_debug.reject
|
||||
@@ -7,14 +7,14 @@
|
||||
SET @saved_debug_dbug = @@SESSION.debug_dbug;
|
||||
SET SESSION debug_dbug="+d,ib_dict_create_index_tree_fail";
|
||||
CREATE FULLTEXT INDEX idx ON articles(body);
|
||||
-ERROR HY000: Out of memory.
|
||||
+ERROR HY000: Can't create table `test`.`articles` (errno: 128 "Out of memory in engine")
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
ALTER TABLE articles STATS_PERSISTENT=DEFAULT;
|
||||
DROP TABLE articles;
|
||||
CREATE TABLE t (a INT, b TEXT) engine=innodb;
|
||||
SET debug_dbug='+d,alter_table_rollback_new_index';
|
||||
-ALTER TABLE t ADD FULLTEXT INDEX (b(64));
|
||||
-ERROR HY000: Unknown error
|
||||
+ALTER TABLE t ADD FULLTEXT INDEX (b(64)), ALGORITHM=INPLACE;
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
DROP TABLE t;
|
||||
CREATE TABLE t1 (pk INT, a VARCHAR(8), PRIMARY KEY(pk),
|
||||
@@ -28,32 +28,6 @@
|
||||
DROP TABLE t2, t1;
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
#
|
||||
-# MDEV-25200 Index count mismatch due to aborted FULLTEXT INDEX
|
||||
-#
|
||||
-CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
|
||||
-INSERT INTO t1 VALUES(1, "test", "test_1");
|
||||
-connect con1,localhost,root,,test;
|
||||
-SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
|
||||
-SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
|
||||
-ALTER TABLE t1 ADD FULLTEXT(c);
|
||||
-connection default;
|
||||
-SET DEBUG_SYNC='now WAIT_FOR s2';
|
||||
-START TRANSACTION;
|
||||
-SELECT * FROM t1;
|
||||
-a b c
|
||||
-1 test test_1
|
||||
-SET DEBUG_SYNC='now SIGNAL g2';
|
||||
-connection con1;
|
||||
-ERROR HY000: Out of memory.
|
||||
-disconnect con1;
|
||||
-connection default;
|
||||
-SET DEBUG_SYNC=RESET;
|
||||
-ALTER TABLE t1 ADD bl INT AS (LENGTH(b)) VIRTUAL;
|
||||
-CHECK TABLE t1;
|
||||
-Table Op Msg_type Msg_text
|
||||
-test.t1 check status OK
|
||||
-DROP TABLE t1;
|
||||
-#
|
||||
# MDEV-25663 Double free of transaction during TRUNCATE
|
||||
#
|
||||
call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)");
|
||||
@@ -65,12 +39,3 @@
|
||||
SET debug_dbug=@saved_debug_dbug;
|
||||
DROP TABLE t1;
|
||||
# End of 10.3 tests
|
||||
-CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
|
||||
-SET DEBUG_DBUG="+d,stats_lock_fail";
|
||||
-ALTER TABLE t1 ADD FULLTEXT(f2);
|
||||
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
||||
-SET debug_dbug=@saved_debug_dbug;
|
||||
-ALTER TABLE t1 DISCARD TABLESPACE;
|
||||
-ALTER TABLE t1 ADD FULLTEXT(f2);
|
||||
-ERROR HY000: Tablespace has been discarded for table `t1`
|
||||
-DROP TABLE t1;
|
||||
66
mysql-test/suite/innodb_fts/r/misc_debug,vers_trx.rdiff
Normal file
66
mysql-test/suite/innodb_fts/r/misc_debug,vers_trx.rdiff
Normal file
@@ -0,0 +1,66 @@
|
||||
--- misc_debug.result
|
||||
+++ misc_debug.reject
|
||||
@@ -7,14 +7,14 @@
|
||||
SET @saved_debug_dbug = @@SESSION.debug_dbug;
|
||||
SET SESSION debug_dbug="+d,ib_dict_create_index_tree_fail";
|
||||
CREATE FULLTEXT INDEX idx ON articles(body);
|
||||
-ERROR HY000: Out of memory.
|
||||
+ERROR HY000: Can't create table `test`.`articles` (errno: 128 "Out of memory in engine")
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
ALTER TABLE articles STATS_PERSISTENT=DEFAULT;
|
||||
DROP TABLE articles;
|
||||
CREATE TABLE t (a INT, b TEXT) engine=innodb;
|
||||
SET debug_dbug='+d,alter_table_rollback_new_index';
|
||||
-ALTER TABLE t ADD FULLTEXT INDEX (b(64));
|
||||
-ERROR HY000: Unknown error
|
||||
+ALTER TABLE t ADD FULLTEXT INDEX (b(64)), ALGORITHM=INPLACE;
|
||||
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned operations. Try ALGORITHM=COPY
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
DROP TABLE t;
|
||||
CREATE TABLE t1 (pk INT, a VARCHAR(8), PRIMARY KEY(pk),
|
||||
@@ -28,32 +28,6 @@
|
||||
DROP TABLE t2, t1;
|
||||
SET SESSION debug_dbug=@saved_debug_dbug;
|
||||
#
|
||||
-# MDEV-25200 Index count mismatch due to aborted FULLTEXT INDEX
|
||||
-#
|
||||
-CREATE TABLE t1(a INT, b TEXT, c TEXT, FULLTEXT INDEX(b)) ENGINE=InnoDB;
|
||||
-INSERT INTO t1 VALUES(1, "test", "test_1");
|
||||
-connect con1,localhost,root,,test;
|
||||
-SET DEBUG_DBUG="+d,innodb_OOM_inplace_alter";
|
||||
-SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL s2 WAIT_FOR g2';
|
||||
-ALTER TABLE t1 ADD FULLTEXT(c);
|
||||
-connection default;
|
||||
-SET DEBUG_SYNC='now WAIT_FOR s2';
|
||||
-START TRANSACTION;
|
||||
-SELECT * FROM t1;
|
||||
-a b c
|
||||
-1 test test_1
|
||||
-SET DEBUG_SYNC='now SIGNAL g2';
|
||||
-connection con1;
|
||||
-ERROR HY000: Out of memory.
|
||||
-disconnect con1;
|
||||
-connection default;
|
||||
-SET DEBUG_SYNC=RESET;
|
||||
-ALTER TABLE t1 ADD bl INT AS (LENGTH(b)) VIRTUAL;
|
||||
-CHECK TABLE t1;
|
||||
-Table Op Msg_type Msg_text
|
||||
-test.t1 check status OK
|
||||
-DROP TABLE t1;
|
||||
-#
|
||||
# MDEV-25663 Double free of transaction during TRUNCATE
|
||||
#
|
||||
call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)");
|
||||
@@ -65,12 +39,3 @@
|
||||
SET debug_dbug=@saved_debug_dbug;
|
||||
DROP TABLE t1;
|
||||
# End of 10.3 tests
|
||||
-CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
|
||||
-SET DEBUG_DBUG="+d,stats_lock_fail";
|
||||
-ALTER TABLE t1 ADD FULLTEXT(f2);
|
||||
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
||||
-SET debug_dbug=@saved_debug_dbug;
|
||||
-ALTER TABLE t1 DISCARD TABLESPACE;
|
||||
-ALTER TABLE t1 ADD FULLTEXT(f2);
|
||||
-ERROR HY000: Tablespace has been discarded for table `t1`
|
||||
-DROP TABLE t1;
|
||||
12
mysql-test/suite/innodb_fts/r/sync_ddl,vers.rdiff
Normal file
12
mysql-test/suite/innodb_fts/r/sync_ddl,vers.rdiff
Normal file
@@ -0,0 +1,12 @@
|
||||
--- sync_ddl.result
|
||||
+++ sync_ddl.reject
|
||||
@@ -100,7 +100,7 @@
|
||||
ADD COLUMN id2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
DROP INDEX idx1,
|
||||
ADD FULLTEXT INDEX idx2(value);
|
||||
-affected rows: 0
|
||||
-info: Records: 0 Duplicates: 0 Warnings: 0
|
||||
+affected rows: 2
|
||||
+info: Records: 2 Duplicates: 0 Warnings: 0
|
||||
DROP TABLE t1;
|
||||
SET GLOBAL debug_dbug = @save_debug;
|
||||
12
mysql-test/suite/innodb_fts/r/sync_ddl,vers_trx.rdiff
Normal file
12
mysql-test/suite/innodb_fts/r/sync_ddl,vers_trx.rdiff
Normal file
@@ -0,0 +1,12 @@
|
||||
--- sync_ddl.result
|
||||
+++ sync_ddl.reject
|
||||
@@ -100,7 +100,7 @@
|
||||
ADD COLUMN id2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
DROP INDEX idx1,
|
||||
ADD FULLTEXT INDEX idx2(value);
|
||||
-affected rows: 0
|
||||
-info: Records: 0 Duplicates: 0 Warnings: 0
|
||||
+affected rows: 2
|
||||
+info: Records: 2 Duplicates: 0 Warnings: 0
|
||||
DROP TABLE t1;
|
||||
SET GLOBAL debug_dbug = @save_debug;
|
||||
@@ -99,7 +99,8 @@ ALTER TABLE t1
|
||||
DROP COLUMN id1,
|
||||
ADD COLUMN id2 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
DROP INDEX idx1,
|
||||
ADD FULLTEXT INDEX idx2(value),
|
||||
ALGORITHM=INPLACE;
|
||||
ADD FULLTEXT INDEX idx2(value);
|
||||
affected rows: 0
|
||||
info: Records: 0 Duplicates: 0 Warnings: 0
|
||||
DROP TABLE t1;
|
||||
SET GLOBAL debug_dbug = @save_debug;
|
||||
|
||||
Reference in New Issue
Block a user