mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Adjust the MySQL 5.7 tests for MariaDB 10.2
This commit is contained in:
@ -33,15 +33,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -209,15 +205,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -385,15 +377,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -562,15 +550,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -740,15 +724,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -917,15 +897,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
|
@ -16,28 +16,29 @@ title VARCHAR(100)
|
|||||||
SELECT COUNT(*) FROM t1;
|
SELECT COUNT(*) FROM t1;
|
||||||
COUNT(*)
|
COUNT(*)
|
||||||
10000
|
10000
|
||||||
SET SESSION debug="+d,ib_index_build_fail_before_flush";
|
SET @saved_dbug= @@SESSION.debug_dbug;
|
||||||
|
SET debug_dbug='+d,ib_index_build_fail_before_flush';
|
||||||
CREATE INDEX idx_id ON t1(id);
|
CREATE INDEX idx_id ON t1(id);
|
||||||
ERROR HY000: Got error 1000 from storage engine
|
ERROR 70100: Query execution was interrupted
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
CREATE INDEX idx_title ON t1(title);
|
CREATE INDEX idx_title ON t1(title);
|
||||||
ERROR HY000: Got error 1000 from storage engine
|
ERROR 70100: Query execution was interrupted
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
CREATE FULLTEXT INDEX fidx_title ON t1(title);
|
CREATE FULLTEXT INDEX fidx_title ON t1(title);
|
||||||
ERROR HY000: Got error 1000 from storage engine
|
ERROR 70100: Query execution was interrupted
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
ALTER TABLE t1 ADD COLUMN content TEXT;
|
ALTER TABLE t1 ADD COLUMN content TEXT;
|
||||||
ERROR HY000: Got error 1000 from storage engine
|
ERROR 70100: Query execution was interrupted
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
SET SESSION debug="-d,ib_index_build_fail_before_flush";
|
SET debug_dbug= @saved_dbug;
|
||||||
INSERT INTO t1 VALUES(10001, 10001, 'a10000');
|
INSERT INTO t1 VALUES(10001, 10001, 'a10000');
|
||||||
ALTER TABLE t1 ADD UNIQUE INDEX idx_title(title);
|
ALTER TABLE t1 ADD UNIQUE INDEX idx_title(title);
|
||||||
ERROR 23000: Duplicate entry 'a10000' for key 'idx_title'
|
ERROR 23000: Duplicate entry 'a10000' for key 'idx_title'
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
include/master-slave.inc
|
include/master-slave.inc
|
||||||
Warnings:
|
|
||||||
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
|
|
||||||
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
|
|
||||||
[connection master]
|
[connection master]
|
||||||
|
connection master;
|
||||||
CREATE PROCEDURE populate_t1(load_even INT)
|
CREATE PROCEDURE populate_t1(load_even INT)
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE i int DEFAULT 1;
|
DECLARE i int DEFAULT 1;
|
||||||
@ -31,15 +29,11 @@ CREATE INDEX idx_id ON t1(id);
|
|||||||
CREATE INDEX idx_title ON t1(title);
|
CREATE INDEX idx_title ON t1(title);
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -148,6 +142,7 @@ class id title
|
|||||||
SELECT * FROM t_part WHERE title = 'a101';
|
SELECT * FROM t_part WHERE title = 'a101';
|
||||||
class id title
|
class id title
|
||||||
include/sync_slave_sql_with_master.inc
|
include/sync_slave_sql_with_master.inc
|
||||||
|
connection slave;
|
||||||
SHOW CREATE TABLE t1;
|
SHOW CREATE TABLE t1;
|
||||||
Table Create Table
|
Table Create Table
|
||||||
t1 CREATE TABLE `t1` (
|
t1 CREATE TABLE `t1` (
|
||||||
@ -165,11 +160,11 @@ t_part CREATE TABLE `t_part` (
|
|||||||
`title` varchar(30) DEFAULT NULL,
|
`title` varchar(30) DEFAULT NULL,
|
||||||
KEY `idx` (`class`,`id`,`title`(10))
|
KEY `idx` (`class`,`id`,`title`(10))
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||||
/*!50100 PARTITION BY RANGE (id)
|
PARTITION BY RANGE (`id`)
|
||||||
SUBPARTITION BY KEY (id)
|
SUBPARTITION BY KEY (`id`)
|
||||||
SUBPARTITIONS 4
|
SUBPARTITIONS 4
|
||||||
(PARTITION p0 VALUES LESS THAN (5000) ENGINE = InnoDB,
|
(PARTITION `p0` VALUES LESS THAN (5000) ENGINE = InnoDB,
|
||||||
PARTITION p1 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
|
PARTITION `p1` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
|
||||||
SELECT COUNT(*) FROM t1;
|
SELECT COUNT(*) FROM t1;
|
||||||
COUNT(*)
|
COUNT(*)
|
||||||
97
|
97
|
||||||
@ -220,6 +215,7 @@ SELECT * FROM t_part WHERE id = 101;
|
|||||||
class id title
|
class id title
|
||||||
SELECT * FROM t_part WHERE title = 'a101';
|
SELECT * FROM t_part WHERE title = 'a101';
|
||||||
class id title
|
class id title
|
||||||
|
connection master;
|
||||||
DROP PROCEDURE populate_t1;
|
DROP PROCEDURE populate_t1;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
DROP TABLE t_part;
|
DROP TABLE t_part;
|
||||||
|
@ -28,15 +28,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
@ -95,15 +91,11 @@ Table Op Msg_type Msg_text
|
|||||||
test.t1 check status OK
|
test.t1 check status OK
|
||||||
/* Select by index. */
|
/* Select by index. */
|
||||||
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
EXPLAIN SELECT * FROM t1 WHERE id = 10;
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_id idx_id 5 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_id idx_id 5 const 1
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`id` = 10)
|
|
||||||
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
EXPLAIN SELECT * FROM t1 WHERE title = 'a10';
|
||||||
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 NULL
|
1 SIMPLE t1 ref idx_title idx_title 103 const 1 Using index condition
|
||||||
Warnings:
|
|
||||||
Note 1003 /* select#1 */ select `test`.`t1`.`class` AS `class`,`test`.`t1`.`id` AS `id`,`test`.`t1`.`title` AS `title` from `test`.`t1` where (`test`.`t1`.`title` = 'a10')
|
|
||||||
SELECT * FROM t1 WHERE id = 10;
|
SELECT * FROM t1 WHERE id = 10;
|
||||||
class id title
|
class id title
|
||||||
10 10 a10
|
10 10 a10
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
-- source include/not_embedded.inc
|
-- source include/not_embedded.inc
|
||||||
-- source include/have_innodb.inc
|
-- source include/innodb_page_size_small.inc
|
||||||
-- source include/have_innodb_zip.inc
|
|
||||||
-- source include/big_test.inc
|
-- source include/big_test.inc
|
||||||
|
|
||||||
# Test Row Format: REDUNDANT.
|
# Test Row Format: REDUNDANT.
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
# Test Restart & Crash Recovery.
|
# Test Restart & Crash Recovery.
|
||||||
-- source include/big_test.inc
|
-- source include/big_test.inc
|
||||||
-- source include/have_innodb_zip.inc
|
-- source include/innodb_page_size_small.inc
|
||||||
|
|
||||||
# Test Row Format: REDUNDANT.
|
# Test Row Format: REDUNDANT.
|
||||||
let $row_format = REDUNDANT;
|
let $row_format = REDUNDANT;
|
||||||
|
@ -33,29 +33,30 @@ CALL populate_t1();
|
|||||||
|
|
||||||
SELECT COUNT(*) FROM t1;
|
SELECT COUNT(*) FROM t1;
|
||||||
|
|
||||||
SET SESSION debug="+d,ib_index_build_fail_before_flush";
|
SET @saved_dbug= @@SESSION.debug_dbug;
|
||||||
|
SET debug_dbug='+d,ib_index_build_fail_before_flush';
|
||||||
|
|
||||||
-- error ER_GET_ERRNO
|
-- error ER_QUERY_INTERRUPTED
|
||||||
CREATE INDEX idx_id ON t1(id);
|
CREATE INDEX idx_id ON t1(id);
|
||||||
|
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
|
|
||||||
-- error ER_GET_ERRNO
|
-- error ER_QUERY_INTERRUPTED
|
||||||
CREATE INDEX idx_title ON t1(title);
|
CREATE INDEX idx_title ON t1(title);
|
||||||
|
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
|
|
||||||
-- error ER_GET_ERRNO
|
-- error ER_QUERY_INTERRUPTED
|
||||||
CREATE FULLTEXT INDEX fidx_title ON t1(title);
|
CREATE FULLTEXT INDEX fidx_title ON t1(title);
|
||||||
|
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
|
|
||||||
-- error ER_GET_ERRNO
|
-- error ER_QUERY_INTERRUPTED
|
||||||
ALTER TABLE t1 ADD COLUMN content TEXT;
|
ALTER TABLE t1 ADD COLUMN content TEXT;
|
||||||
|
|
||||||
CHECK TABLE t1;
|
CHECK TABLE t1;
|
||||||
|
|
||||||
SET SESSION debug="-d,ib_index_build_fail_before_flush";
|
SET debug_dbug= @saved_dbug;
|
||||||
|
|
||||||
INSERT INTO t1 VALUES(10001, 10001, 'a10000');
|
INSERT INTO t1 VALUES(10001, 10001, 'a10000');
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
--source include/not_embedded.inc
|
--source include/not_embedded.inc
|
||||||
-- source include/have_innodb.inc
|
-- source include/have_innodb.inc
|
||||||
|
-- source include/have_partition.inc
|
||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
|
|
||||||
-- connection master
|
-- connection master
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
# wl#7277: InnoDB: Bulk Load for Create Index
|
# wl#7277: InnoDB: Bulk Load for Create Index
|
||||||
#
|
#
|
||||||
|
|
||||||
-- source include/have_innodb.inc
|
-- source include/innodb_page_size_small.inc
|
||||||
-- source include/have_innodb_zip.inc
|
|
||||||
|
|
||||||
# Create Insert Procedure
|
# Create Insert Procedure
|
||||||
DELIMITER |;
|
DELIMITER |;
|
||||||
|
@ -5024,7 +5024,7 @@ func_exit:
|
|||||||
ut_ad(need_flush_observer);
|
ut_ad(need_flush_observer);
|
||||||
|
|
||||||
DBUG_EXECUTE_IF("ib_index_build_fail_before_flush",
|
DBUG_EXECUTE_IF("ib_index_build_fail_before_flush",
|
||||||
error = DB_FAIL;
|
error = DB_INTERRUPTED;
|
||||||
);
|
);
|
||||||
|
|
||||||
if (error != DB_SUCCESS) {
|
if (error != DB_SUCCESS) {
|
||||||
|
Reference in New Issue
Block a user