mirror of
https://github.com/MariaDB/server.git
synced 2025-11-04 04:46:15 +01:00
d324c03d0c
Dead code cleanup: part_info->num_parts usage was wrong and working incorrectly in mysql_drop_partitions() because num_parts is already updated in prep_alter_part_table(). We don't have to update part_info->partitions because part_info is destroyed at alter_partition_lock_handling(). Cleanups: - DBUG_EVALUATE_IF() macro replaced by shorter form DBUG_IF(); - Typo in ER_KEY_COLUMN_DOES_NOT_EXITS. Refactorings: - Splitted write_log_replace_delete_frm() into write_log_delete_frm() and write_log_replace_frm(); - partition_info via DDL_LOG_STATE; - set_part_info_exec_log_entry() removed. DBUG_EVALUATE removed DBUG_EVALUTATE was only added for consistency together with DBUG_EVALUATE_IF. It is not used anywhere in the code. DBUG_SUICIDE() fix on release build On release DBUG_SUICIDE() was statement. It was wrong as DBUG_SUICIDE() is used in expression context.
120 lines
2.9 KiB
Text
120 lines
2.9 KiB
Text
--source include/have_partition.inc
|
|
--source include/have_debug.inc
|
|
--source include/have_debug_sync.inc
|
|
# Save the initial number of concurrent sessions.
|
|
--source include/count_sessions.inc
|
|
|
|
--echo #
|
|
--echo # Bug #43867 ALTER TABLE on a partitioned table
|
|
--echo # causes unnecessary deadlocks
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (a int) PARTITION BY RANGE (a)
|
|
(PARTITION p0 VALUES LESS THAN (1),
|
|
PARTITION p1 VALUES LESS THAN (2));
|
|
|
|
INSERT INTO t1 VALUES (0),(1);
|
|
|
|
connect(con1,localhost,root);
|
|
|
|
connection con1;
|
|
BEGIN;
|
|
SELECT * FROM t1;
|
|
|
|
connection default;
|
|
--error ER_PARTITION_DOES_NOT_EXIST
|
|
ALTER TABLE t1 DROP PARTITION p3;
|
|
|
|
connection con1;
|
|
--echo # This failed with deadlock and should not do so.
|
|
SELECT * FROM t1;
|
|
|
|
connection default;
|
|
disconnect con1;
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo #
|
|
--echo # Bug #46654 False deadlock on concurrent DML/DDL
|
|
--echo # with partitions, inconsistent behavior
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS tbl_with_partitions;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE tbl_with_partitions ( i INT )
|
|
PARTITION BY HASH(i);
|
|
INSERT INTO tbl_with_partitions VALUES (1);
|
|
|
|
connect(con2,localhost,root);
|
|
connect(con3,localhost,root);
|
|
|
|
connection con3;
|
|
LOCK TABLE tbl_with_partitions READ;
|
|
|
|
--echo # Access table with disabled autocommit
|
|
connection default;
|
|
SET AUTOCOMMIT = 0;
|
|
SELECT * FROM tbl_with_partitions;
|
|
|
|
--echo # Alter table, abort after prepare
|
|
connection con2;
|
|
set session debug_dbug="+d,abort_copy_table";
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE tbl_with_partitions ADD COLUMN f INT;
|
|
|
|
--echo # Try accessing the table after Alter aborted.
|
|
--echo # This used to give ER_LOCK_DEADLOCK.
|
|
connection default;
|
|
SELECT * FROM tbl_with_partitions;
|
|
|
|
connection con3;
|
|
UNLOCK TABLES;
|
|
|
|
--echo # Cleanup
|
|
connection default;
|
|
disconnect con2;
|
|
disconnect con3;
|
|
DROP TABLE tbl_with_partitions;
|
|
|
|
--echo #
|
|
--echo # MDEV-15465 Server crash or ASAN heap-use-after-free in Item_func_match::cleanup
|
|
--echo # upon using FT search with partitioning.
|
|
--echo #
|
|
|
|
--connect (con1,localhost,root,,test)
|
|
CREATE OR REPLACE TABLE t1 (c CHAR(8)) ENGINE=MyISAM PARTITION BY KEY(c);
|
|
|
|
--connection default
|
|
set debug_sync= 'execute_command_after_close_tables SIGNAL opened WAIT_FOR go';
|
|
--send
|
|
DELETE FROM t1 WHERE MATCH(c) AGAINST ('foo' IN BOOLEAN MODE);
|
|
|
|
--connection con1
|
|
set debug_sync= 'now WAIT_FOR opened';
|
|
FLUSH TABLES;
|
|
set debug_sync= 'now SIGNAL go';
|
|
|
|
--connection default
|
|
--reap
|
|
set debug_sync= 'execute_command_after_close_tables SIGNAL opened WAIT_FOR go';
|
|
--send
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('foo' IN BOOLEAN MODE);
|
|
|
|
--connection con1
|
|
set debug_sync= 'now WAIT_FOR opened';
|
|
FLUSH TABLES;
|
|
set debug_sync= 'now SIGNAL go';
|
|
|
|
# Cleanup
|
|
--disconnect con1
|
|
--connection default
|
|
--reap
|
|
DROP TABLE t1;
|
|
set debug_sync= 'RESET';
|
|
|
|
|
|
# Check that all connections opened by test cases in this file are really
|
|
# gone so execution of other tests won't be affected by their presence.
|
|
--source include/wait_until_count_sessions.inc
|