mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
8774a02364
Implementation of MDEV-7660 introduced unwanted incompatible change: modifications under LOCK TABLES with autocommit enabled are rolled back on disconnect. Previously everything was committed, because LOCK TABLES didn't adjust autocommit setting. This patch restores original behavior by reverting some changes done in MDEV-7660: - sql/sql_parse.cc: do not reset autocommit on LOCK TABLES - sql/sql_base.cc: do not set autocommit on UNLOCK TABLES - test cases: main.lock_tables_lost_commit, main.partition_explicit_prune, rpl.rpl_switch_stm_row_mixed, tokudb.nested_txn_implicit_commit, tokudb_bugs.db806 But it makes InnoDB tables under LOCK TABLES ... READ [LOCAL] not protected against DML. To restore protection some changes from WL#6671 were merged, specifically MDL_SHARED_READ_ONLY and test cases. WL#6671 merge highlights: - Not all tests merged. - In MySQL LOCK TABLES ... READ acquires MDL_SHARED_READ_ONLY for all engines, in MariaDB MDL_SHARED_READ is always acquired first and then upgraded to MDL_SHARED_READ_ONLY for InnoDB only. - The above allows us to omit MDL_SHARED_WRITE_LOW_PRIO implementation in MariaDB, which is rather useless with InnoDB. In MySQL it is needed to preserve locking behavior between low priority writes and LOCK TABLES ... READ for non-InnoDB engines (covered by sys_vars.sql_low_priority_updates_func). - Omitted HA_NO_READ_LOCAL_LOCK, we rely on lock_count() instead. - Omitted "piglets": in MariaDB stream of DML against InnoDB table may lead to concurrent LOCK TABLES ... READ starvation. - HANDLER ... OPEN acquires MDL_SHARED_READ instead of MDL_SHARED in MariaDB. - Omitted SNRW->X MDL lock upgrade for IMPORT/DISCARD TABLESPAECE under LOCK TABLES. - Omitted strong locks for views, triggers and SP under LOCK TABLES. - Omitted IX schema lock for LOCK TABLES READ. - Omitted deadlock weight juggling for LOCK TABLES. Full WL#6671 merge status: - innodb.innodb-lock: fully merged - main.alter_table: not merged due to different HANDLER solution - main.debug_sync: fully merged - main.handler_innodb: not merged due to different HANDLER solution - main.handler_myisam: not merged due to different HANDLER solution - main.innodb_mysql_lock: fully merged - main.insert_notembedded: fully merged - main.lock: not merged (due to no strong locks for views) - main.lock_multi: not merged - main.lock_sync: fully merged (partially in MDEV-7660) - main.mdl_sync: not merged - main.partition_debug_sync: not merged due to different HANDLER solution - main.status: fully merged - main.view: fully merged - perfschema.mdl_func: not merged (no such test in MariaDB) - perfschema.table_aggregate_global_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_global_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_global_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_global_4u_3t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_hist_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_hist_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_hist_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_hist_4u_3t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_thread_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_thread_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_thread_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_aggregate_thread_4u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_global_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_global_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_global_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_global_4u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_hist_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_hist_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_hist_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_hist_4u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_thread_2u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_thread_2u_3t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_thread_4u_2t: not merged (didn't fail in MariaDB) - perfschema.table_lock_aggregate_thread_4u_3t: not merged (didn't fail in MariaDB) - sys_vars.sql_low_priority_updates_func: not merged - include/thr_rwlock.h: not merged, rw_pr_lock_assert_write_owner and rw_pr_lock_assert_not_write_owner are macros in MariaDB - sql/handler.h: not merged (HA_NO_READ_LOCAL_LOCK) - sql/mdl.cc: partially merged (MDL_SHARED_READ_ONLY only) - sql/mdl.h: partially merged (MDL_SHARED_READ_ONLY only) - sql/lock.cc: fully merged - sql/sp_head.cc: not merged - sql/sp_head.h: not merged - sql/sql_base.cc: partially merged (MDL_SHARED_READ_ONLY only) - sql/sql_base.h: not merged - sql/sql_class.cc: fully merged - sql/sql_class.h: fully merged - sql/sql_handler.cc: merged partially (different solution in MariaDB) - sql/sql_parse.cc: partially merged, mostly omitted low priority write part - sql/sql_reload.cc: not merged comment change - sql/sql_table.cc: not merged SNRW->X upgrade for IMPORT/DISCARD TABLESPACE - sql/sql_view.cc: not merged - sql/sql_yacc.yy: not merged (MDL_SHARED_WRITE_LOW_PRIO, MDL_SHARED_READ_ONLY) - sql/table.cc: not merged (MDL_SHARED_WRITE_LOW_PRIO) - sql/table.h: not merged (MDL_SHARED_WRITE_LOW_PRIO) - sql/trigger.cc: not merged - storage/innobase/handler/ha_innodb.cc: merged store_lock()/lock_count() changes (in MDEV-7660), didn't merge HA_NO_READ_LOCAL_LOCK - storage/innobase/handler/ha_innodb.h: fully merged in MDEV-7660 - storage/myisammrg/ha_myisammrg.cc: not merged comment change - storage/perfschema/table_helper.cc: not merged (no MDL support in MariaDB PFS) - unittest/gunit/mdl-t.cc: not merged - unittest/gunit/mdl_sync-t.cc: not merged MariaDB specific changes: - handler.heap: different HANDLER solution, MDEV-7660 - handler.innodb: different HANDLER solution, MDEV-7660 - handler.interface: different HANDLER solution, MDEV-7660 - handler.myisam: different HANDLER solution, MDEV-7660 - main.mdl_sync: MDEV-7660 specific changes - main.partition_debug_sync: removed test due to different HANDLER solution, MDEV-7660 - main.truncate_coverage: removed test due to different HANDLER solution, MDEV-7660 - mysql-test/include/mtr_warnings.sql: additional cleanup, MDEV-7660 - mysql-test/lib/v1/mtr_report.pl: additional cleanup, MDEV-7660 - plugin/metadata_lock_info/metadata_lock_info.cc: not in MySQL - sql/sql_handler.cc: MariaDB specific fix for mysql_ha_read(), MDEV-7660
254 lines
6.2 KiB
Text
254 lines
6.2 KiB
Text
-- source include/have_innodb.inc
|
|
|
|
# Save the initial number of concurrent sessions.
|
|
--source include/count_sessions.inc
|
|
|
|
set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
|
|
set global innodb_lock_wait_timeout=300;
|
|
set session innodb_lock_wait_timeout=300;
|
|
|
|
--echo #
|
|
--echo # Bug #22876 Four-way deadlock
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
connect (con3,localhost,root,,);
|
|
|
|
connection con1;
|
|
set @@autocommit=0;
|
|
CREATE TABLE t1(s1 INT UNIQUE) ENGINE=innodb;
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
connection con2;
|
|
set @@autocommit=0;
|
|
INSERT INTO t1 VALUES (2);
|
|
--send INSERT INTO t1 VALUES (1)
|
|
|
|
connection con3;
|
|
set @@autocommit=0;
|
|
--send DROP TABLE t1
|
|
|
|
connection con1;
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE info = "INSERT INTO t1 VALUES (1)" and
|
|
state = "update";
|
|
--source include/wait_condition.inc
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE info = "DROP TABLE t1" and
|
|
state = "Waiting for table metadata lock";
|
|
--source include/wait_condition.inc
|
|
--echo # Connection 1 is now holding the lock.
|
|
--echo # Issuing insert from connection 1 while connection 2&3
|
|
--echo # is waiting for the lock should give a deadlock error.
|
|
--error ER_LOCK_DEADLOCK
|
|
INSERT INTO t1 VALUES (2);
|
|
|
|
--echo # Cleanup
|
|
connection con2;
|
|
--reap
|
|
commit;
|
|
set @@autocommit=1;
|
|
connection con1;
|
|
commit;
|
|
set @@autocommit=1;
|
|
connection con3;
|
|
--reap
|
|
set @@autocommit=1;
|
|
connection default;
|
|
|
|
disconnect con1;
|
|
disconnect con2;
|
|
disconnect con3;
|
|
|
|
|
|
--echo #
|
|
--echo # Test for bug #37346 "innodb does not detect deadlock between update
|
|
--echo # and alter table".
|
|
--echo #
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
create table t1 (c1 int primary key, c2 int, c3 int) engine=InnoDB;
|
|
insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);
|
|
begin;
|
|
--echo # Run statement which acquires X-lock on one of table's rows.
|
|
update t1 set c3=c3+1 where c2=3;
|
|
|
|
--echo #
|
|
connect (con37346,localhost,root,,test,,);
|
|
connection con37346;
|
|
--echo # The below ALTER TABLE statement should wait till transaction
|
|
--echo # in connection 'default' is complete and then succeed.
|
|
--echo # It should not deadlock or fail with ER_LOCK_DEADLOCK error.
|
|
--echo # Sending:
|
|
--send alter table t1 add column c4 int;
|
|
|
|
--echo #
|
|
connection default;
|
|
--echo # Wait until the above ALTER TABLE gets blocked because this
|
|
--echo # connection holds SW metadata lock on table to be altered.
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = "Waiting for table metadata lock" and
|
|
info = "alter table t1 add column c4 int";
|
|
--source include/wait_condition.inc
|
|
|
|
--echo # The below statement should succeed. It should not
|
|
--echo # deadlock or end with ER_LOCK_DEADLOCK error.
|
|
update t1 set c3=c3+1 where c2=4;
|
|
|
|
--echo # Unblock ALTER TABLE by committing transaction.
|
|
commit;
|
|
|
|
--echo #
|
|
connection con37346;
|
|
--echo # Reaping ALTER TABLE.
|
|
--reap
|
|
|
|
--echo #
|
|
connection default;
|
|
disconnect con37346;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Bug#53798 OPTIMIZE TABLE breaks repeatable read
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (a INT) engine=innodb;
|
|
INSERT INTO t1 VALUES (1), (2), (3);
|
|
|
|
connect (con1, localhost, root);
|
|
START TRANSACTION WITH CONSISTENT SNAPSHOT;
|
|
SELECT * FROM t1;
|
|
|
|
connection default;
|
|
--echo # This should block
|
|
--echo # Sending:
|
|
--send OPTIMIZE TABLE t1
|
|
|
|
connection con1;
|
|
let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
|
|
WHERE state='Waiting for table metadata lock' AND info='OPTIMIZE TABLE t1';
|
|
--source include/wait_condition.inc
|
|
SELECT * FROM t1;
|
|
COMMIT;
|
|
|
|
connection default;
|
|
--echo # Reaping OPTIMIZE TABLE t1
|
|
--reap
|
|
disconnect con1;
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo #
|
|
--echo # Bug#49891 View DDL breaks REPEATABLE READ
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
DROP VIEW IF EXISTS v2;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 ( f1 INTEGER ) ENGINE = innodb;
|
|
CREATE TABLE t2 ( f1 INTEGER );
|
|
CREATE VIEW v1 AS SELECT 1 FROM t1;
|
|
|
|
connect (con2, localhost, root);
|
|
connect (con3, localhost, root);
|
|
|
|
connection con3;
|
|
LOCK TABLE t1 WRITE;
|
|
|
|
connection default;
|
|
START TRANSACTION;
|
|
# This should block due to t1 being locked.
|
|
--echo # Sending:
|
|
--send SELECT * FROM v1
|
|
|
|
connection con2;
|
|
--echo # Waiting for 'SELECT * FROM v1' to sync in.
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE state = "Waiting for table metadata lock" AND info = "SELECT * FROM v1";
|
|
--source include/wait_condition.inc
|
|
# This should block due to v1 being locked.
|
|
--echo # Sending:
|
|
--send ALTER VIEW v1 AS SELECT 2 FROM t2
|
|
|
|
connection con3;
|
|
--echo # Waiting for 'ALTER VIEW v1 AS SELECT 2 FROM t2' to sync in.
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE state = "Waiting for table metadata lock" AND
|
|
info = "ALTER VIEW v1 AS SELECT 2 FROM t2";
|
|
--source include/wait_condition.inc
|
|
# Unlock t1 allowing SELECT * FROM v1 to proceed.
|
|
UNLOCK TABLES;
|
|
|
|
connection default;
|
|
--echo # Reaping: SELECT * FROM v1
|
|
--reap
|
|
SELECT * FROM v1;
|
|
COMMIT;
|
|
|
|
connection con2;
|
|
--echo # Reaping: ALTER VIEW v1 AS SELECT 2 FROM t2
|
|
--reap
|
|
|
|
connection default;
|
|
DROP TABLE t1, t2;
|
|
DROP VIEW v1;
|
|
disconnect con2;
|
|
disconnect con3;
|
|
|
|
|
|
--echo #
|
|
--echo # Bug#11815600 [ERROR] INNODB COULD NOT FIND INDEX PRIMARY
|
|
--echo # KEY NO 0 FOR TABLE IN ERROR LOG
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
--connect (con1,localhost,root)
|
|
|
|
connection default;
|
|
CREATE TABLE t1 (id INT PRIMARY KEY, value INT) ENGINE = InnoDB;
|
|
INSERT INTO t1 VALUES (1, 12345);
|
|
START TRANSACTION;
|
|
SELECT * FROM t1;
|
|
|
|
--connection con1
|
|
SET lock_wait_timeout=1;
|
|
# Test with two timeouts, as the first version of this patch
|
|
# only worked with one timeout.
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE t1 ADD INDEX idx(value);
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE t1 ADD INDEX idx(value);
|
|
|
|
--connection default
|
|
SELECT * FROM t1;
|
|
COMMIT;
|
|
DROP TABLE t1;
|
|
disconnect con1;
|
|
|
|
|
|
# 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
|
|
|
|
set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout;
|
|
|