mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
fbfa18daf0
The log tables are by nature PERFORMANCE_SCHEMA tables, which should not be affected by SET GLOBAL READ_ONLY or FLUSH TABLES WITH READ LOCK. The implementation of FLUSH TABLES WITH READ LOCK already ignored log tables. Now with this patch, the implementation of LOCK TABLE also ignore a global read lock for log tables, which was the missing symmetry. mysql-test/r/flush.result: Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock - test result. mysql-test/t/flush.test: Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock - test case. sql/lock.cc: Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock - logger.is_privileged_thread() used. sql/log.h: Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock - LOGGER::is_privileged_thread() introduced that returns TRUE if a given thread is either a general_log or a slow_log or a privileged thread. sql/sql_base.cc: Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock - pass MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK to the mysql_lock_tables() in case of call from a logger in order not to honor the GLOBAL READ LOCK and to avoid possible deadlocks.
73 lines
2 KiB
Text
73 lines
2 KiB
Text
drop table if exists t1,t2;
|
|
drop database if exists mysqltest;
|
|
create temporary table t1(n int not null primary key);
|
|
create table t2(n int);
|
|
insert into t2 values(3);
|
|
select * from t1;
|
|
n
|
|
3
|
|
flush tables with read lock;
|
|
drop table t2;
|
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
|
drop table t2;
|
|
unlock tables;
|
|
create database mysqltest;
|
|
create table mysqltest.t1(n int);
|
|
insert into mysqltest.t1 values (23);
|
|
flush tables with read lock;
|
|
drop database mysqltest;
|
|
select * from mysqltest.t1;
|
|
n
|
|
23
|
|
unlock tables;
|
|
create table t1 (n int);
|
|
flush tables with read lock;
|
|
insert into t1 values (345);
|
|
select * from t1;
|
|
n
|
|
345
|
|
drop table t1;
|
|
create table t1 (c1 int);
|
|
lock table t1 write;
|
|
flush tables with read lock;
|
|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
|
lock table t1 read;
|
|
flush tables with read lock;
|
|
lock table t1 write;
|
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
|
lock table t1 read;
|
|
lock table t1 write;
|
|
ERROR HY000: Can't execute the query because you have a conflicting read lock
|
|
unlock tables;
|
|
create table t2 (c1 int);
|
|
create table t3 (c1 int);
|
|
lock table t1 read, t2 read, t3 write;
|
|
flush tables with read lock;
|
|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
|
|
lock table t1 read, t2 read, t3 read;
|
|
flush tables with read lock;
|
|
unlock tables;
|
|
drop table t1, t2, t3;
|
|
create table t1 (c1 int);
|
|
create table t2 (c1 int);
|
|
lock table t1 write;
|
|
flush tables with read lock;
|
|
insert into t2 values(1);
|
|
unlock tables;
|
|
drop table t1, t2;
|
|
End of 5.0 tests
|
|
set @old_general_log= @@general_log;
|
|
set @old_read_only= @@read_only;
|
|
set global general_log= on;
|
|
flush tables with read lock;
|
|
flush logs;
|
|
unlock tables;
|
|
set global read_only=1;
|
|
flush logs;
|
|
unlock tables;
|
|
flush tables with read lock;
|
|
flush logs;
|
|
unlock tables;
|
|
set global general_log= @old_general_log;
|
|
set global read_only= @old_read_only;
|
|
End of 5.1 tests
|