mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
c19affef54
The problem was that some facilities (like CONVERT_TZ() function or server HELP statement) may require implicit access to some tables in 'mysql' database. This access was done by ordinary means of adding such tables to the list of tables the query is going to open. However, if we issued LOCK TABLES before that, we would get "table was not locked" error trying to open such implicit tables. The solution is to treat certain tables as MySQL system tables, like we already do for mysql.proc. Such tables may be opened for reading at any moment regardless of any locks in effect. The cost of this is that system table may be locked for writing only together with other system tables, it is disallowed to lock system tables for writing and have any other lock on any other table. After this patch the following tables are treated as MySQL system tables: mysql.help_category mysql.help_keyword mysql.help_relation mysql.help_topic mysql.proc (it already was) mysql.time_zone mysql.time_zone_leap_second mysql.time_zone_name mysql.time_zone_transition mysql.time_zone_transition_type These tables are now opened with open_system_tables_for_read() and closed with close_system_tables(), or one table may be opened with open_system_table_for_update() and closed with close_thread_tables() (the latter is used for mysql.proc table, which is updated as part of normal MySQL server operation). These functions may be used when some tables were opened and locked already. NOTE: online update of time zone tables is not possible during replication, because there's no time zone cache flush neither on LOCK TABLES, nor on FLUSH TABLES, so the master may serve stale time zone data from cache, while on slave updated data will be loaded from the time zone tables.
152 lines
3.9 KiB
Text
152 lines
3.9 KiB
Text
#
|
|
# Testing of table locking
|
|
#
|
|
|
|
--disable_warnings
|
|
drop table if exists t1,t2;
|
|
--enable_warnings
|
|
CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM;
|
|
insert into t1 (id,id2) values (1,1),(1,2),(1,3);
|
|
LOCK TABLE t1 WRITE;
|
|
select dummy1,count(distinct id) from t1 group by dummy1;
|
|
update t1 set id=-1 where id=1;
|
|
LOCK TABLE t1 READ;
|
|
--error 1099
|
|
update t1 set id=1 where id=1;
|
|
--error 1100
|
|
create table t2 SELECT * from t1;
|
|
create temporary table t2 SELECT * from t1;
|
|
drop table if exists t2;
|
|
unlock tables;
|
|
create table t2 SELECT * from t1;
|
|
LOCK TABLE t1 WRITE,t2 write;
|
|
insert into t2 SELECT * from t1;
|
|
update t1 set id=1 where id=-1;
|
|
drop table t1,t2;
|
|
|
|
|
|
#
|
|
# Check bug with INSERT ... SELECT with lock tables
|
|
#
|
|
|
|
CREATE TABLE t1 (
|
|
index1 smallint(6) default NULL,
|
|
nr smallint(6) default NULL,
|
|
KEY index1(index1)
|
|
) ENGINE=MyISAM;
|
|
|
|
CREATE TABLE t2 (
|
|
nr smallint(6) default NULL,
|
|
name varchar(20) default NULL
|
|
) ENGINE=MyISAM;
|
|
|
|
INSERT INTO t2 VALUES (1,'item1');
|
|
INSERT INTO t2 VALUES (2,'item2');
|
|
|
|
# problem begins here!
|
|
lock tables t1 write, t2 read;
|
|
insert into t1 select 1,nr from t2 where name='item1';
|
|
insert into t1 select 2,nr from t2 where name='item2';
|
|
unlock tables;
|
|
check table t1;
|
|
|
|
# Check error message
|
|
lock tables t1 write;
|
|
check table t2;
|
|
--error 1100
|
|
insert into t1 select index1,nr from t1;
|
|
unlock tables;
|
|
lock tables t1 write, t1 as t1_alias read;
|
|
insert into t1 select index1,nr from t1 as t1_alias;
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# BUG#5390 - problems with merge tables
|
|
# Supplement test for the after-fix optimization
|
|
# Check that a dropped table is correctly removed from a lock.
|
|
create table t1 (c1 int);
|
|
create table t2 (c1 int);
|
|
create table t3 (c1 int);
|
|
lock tables t1 write, t2 write, t3 write;
|
|
# This removes one table after the other from the lock.
|
|
drop table t2, t3, t1;
|
|
#
|
|
# Check that a lock merge works.
|
|
create table t1 (c1 int);
|
|
create table t2 (c1 int);
|
|
create table t3 (c1 int);
|
|
lock tables t1 write, t2 write, t3 write, t1 as t4 read;
|
|
alter table t2 add column c2 int;
|
|
drop table t1, t2, t3;
|
|
|
|
# Bug7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
|
|
#
|
|
create table t1 ( a int(11) not null auto_increment, primary key(a));
|
|
create table t2 ( a int(11) not null auto_increment, primary key(a));
|
|
lock tables t1 write, t2 read;
|
|
delete from t1 using t1,t2 where t1.a=t2.a;
|
|
delete t1 from t1,t2 where t1.a=t2.a;
|
|
--error 1099
|
|
delete from t2 using t1,t2 where t1.a=t2.a;
|
|
--error 1099
|
|
delete t2 from t1,t2 where t1.a=t2.a;
|
|
drop table t1,t2;
|
|
|
|
--echo End of 4.1 tests.
|
|
|
|
|
|
#
|
|
# Bug#18884 "lock table + global read lock = crash"
|
|
# The bug is not repeatable, just add the test case.
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
create table t1 (a int);
|
|
lock table t1 write;
|
|
--error ER_LOCK_OR_ACTIVE_TRANSACTION
|
|
flush tables with read lock;
|
|
unlock tables;
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
# Test LOCK TABLE on system tables. See bug#9953: CONVERT_TZ requires
|
|
# mysql.time_zone_name to be locked.
|
|
#
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (i INT);
|
|
|
|
LOCK TABLES mysql.time_zone READ, mysql.proc READ, t1 READ;
|
|
UNLOCK TABLES;
|
|
|
|
LOCK TABLES mysql.time_zone READ, mysql.proc READ, t1 WRITE;
|
|
UNLOCK TABLES;
|
|
|
|
LOCK TABLES mysql.time_zone READ, mysql.proc READ;
|
|
UNLOCK TABLES;
|
|
|
|
LOCK TABLES mysql.time_zone WRITE, mysql.proc WRITE;
|
|
UNLOCK TABLES;
|
|
|
|
# If at least one system table is locked for WRITE, then all other
|
|
# tables should be system tables locked also for WRITE.
|
|
--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
|
|
LOCK TABLES mysql.time_zone READ, mysql.proc WRITE, t1 READ;
|
|
|
|
--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
|
|
LOCK TABLES mysql.time_zone WRITE, mysql.proc WRITE, t1 READ;
|
|
|
|
--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
|
|
LOCK TABLES mysql.time_zone WRITE, mysql.proc WRITE, t1 WRITE;
|
|
|
|
--error ER_WRONG_LOCK_OF_SYSTEM_TABLE
|
|
LOCK TABLES mysql.time_zone READ, mysql.proc WRITE;
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo End of 5.1 tests.
|