database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

5.5.38 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-06-06 00:07:27 +02:00
parent 2a5905141a 6d75570e99
commit e27c338634
132 changed files with 2524 additions and 3328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mysql-test/suite/binlog/r/binlog_truncate_kill.result Normal file
View File

@ -0,0 +1,38 @@
RESET MASTER;
connection default;
CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
TRUNCATE t1;
connect con1,localhost,root,,;
SET DEBUG_SYNC = "now wait_for truncate_before_lock";
SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
((@id := id) - id)
0
KILL QUERY @id;
connection default;
ERROR 70100: Query execution was interrupted
connection con1;
include/show_binlog_events.inc
connection con1;
connection con1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB
master-bin.000001 # Gtid # # BEGIN GTID #-#-#
master-bin.000001 # Intvar # # INSERT_ID=1
master-bin.000001 # Query # # use `test`; INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10)
master-bin.000001 # Xid # # COMMIT /* XID */
connection con1;
connection con1;
disconnect con1;
connection default;
SELECT * FROM t1;
id a b
1 1 2
2 2 4
3 3 6
4 4 8
5 5 10
DROP TABLE t1;
SET DEBUG_SYNC= 'RESET';

57
mysql-test/suite/binlog/t/binlog_truncate_kill.test Normal file
View File

@ -0,0 +1,57 @@
###############################################################################
# Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG WRITTEN WHILE
# ROWS REMAINS
#
# Problem:
# ========
# When truncate table fails while using transactional based engines even
# though the operation errors out we still continue and log it to binlog.
# Because of this master has data but the truncate will be written to binary
# log which will cause inconsistency.
#
# Test:
# =====
# Make master to wait in "open_table" call during the execution of truncate
# table command and kill the truncate table from other connection. This causes
# open table to return an error saying truncate failed during open table. This
# statement should not be binlogged.
###############################################################################
--source include/have_innodb.inc
--source include/have_debug_sync.inc
--source include/have_binlog_format_statement.inc
RESET MASTER;
--enable_connect_log
--connection default
CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
--send TRUNCATE t1
connect(con1,localhost,root,,);
SET DEBUG_SYNC = "now wait_for truncate_before_lock";
# Wait for one connection to reach open_and_process_table.
--let $show_statement= SHOW PROCESSLIST
--let $field= State
--let $condition= 'debug sync point: open_and_process_table';
--source include/wait_show_condition.inc
SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
# Test killing from mysql server
KILL QUERY @id;
connection default;
--ERROR ER_QUERY_INTERRUPTED
--reap
connection con1;
--source include/show_binlog_events.inc
disconnect con1;
--source include/wait_until_disconnected.inc
connection default;
SELECT * FROM t1;
DROP TABLE t1;
SET DEBUG_SYNC= 'RESET';
--disable_connect_log