mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	upgrading lock, even with low_priority_updates
The problem is that there is no mechanism to control whether a
delayed insert takes a high or low priority lock on a table.
The solution is to modify the delayed insert thread ("handler")
to take into account the global value of low_priority_updates
when taking table locks. The value of low_priority_updates is
retrieved when the insert delayed thread is created and will
remain the same for the duration of the thread.
include/thr_lock.h:
  Update prototype.
mysql-test/r/delayed.result:
  Add test case result for Bug#40536
mysql-test/t/delayed.test:
  Add test case for Bug#40536
mysys/thr_lock.c:
  Add function parameter which specifies the write lock type.
sql/sql_insert.cc:
  Take a low priority write lock if global value of low_priority_updates
  was ON when the thread was created.
		
	
		
			
				
	
	
		
			314 lines
		
	
	
		
			7.5 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			314 lines
		
	
	
		
			7.5 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
drop table if exists t1;
 | 
						|
create table t1 (a char(10), tmsp timestamp);
 | 
						|
insert into t1 set a = 1;
 | 
						|
insert delayed into t1 set a = 2;
 | 
						|
insert into t1 set a = 3, tmsp=NULL;
 | 
						|
insert delayed into t1 set a = 4;
 | 
						|
insert delayed into t1 set a = 5, tmsp = 19711006010203;
 | 
						|
insert delayed into t1 (a, tmsp) values (6, 19711006010203);
 | 
						|
insert delayed into t1 (a, tmsp) values (7, NULL);
 | 
						|
FLUSH TABLE t1;
 | 
						|
insert into t1 set a = 8,tmsp=19711006010203;
 | 
						|
select * from t1 where tmsp=0;
 | 
						|
a	tmsp
 | 
						|
select * from t1 where tmsp=19711006010203;
 | 
						|
a	tmsp
 | 
						|
5	1971-10-06 01:02:03
 | 
						|
6	1971-10-06 01:02:03
 | 
						|
8	1971-10-06 01:02:03
 | 
						|
drop table t1;
 | 
						|
create table t1 (a int not null auto_increment primary key, b char(10));
 | 
						|
insert delayed into t1 values (1,"b");
 | 
						|
insert delayed into t1 values (null,"c");
 | 
						|
insert delayed into t1 values (3,"d"),(null,"e");
 | 
						|
insert delayed into t1 values (3,"this will give an","error");
 | 
						|
ERROR 21S01: Column count doesn't match value count at row 1
 | 
						|
FLUSH TABLE t1;
 | 
						|
show status like 'not_flushed_delayed_rows';
 | 
						|
Variable_name	Value
 | 
						|
Not_flushed_delayed_rows	0
 | 
						|
select * from t1;
 | 
						|
a	b
 | 
						|
1	b
 | 
						|
2	c
 | 
						|
3	d
 | 
						|
4	e
 | 
						|
drop table t1;
 | 
						|
create table t1 (a int not null primary key);
 | 
						|
insert into t1 values (1);
 | 
						|
insert delayed into t1 values (1);
 | 
						|
select * from t1;
 | 
						|
a
 | 
						|
1
 | 
						|
drop table t1;
 | 
						|
CREATE TABLE t1 ( a int(10) NOT NULL auto_increment, PRIMARY KEY (a));
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert into t1 values(null);
 | 
						|
insert into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert into t1 values(null);
 | 
						|
insert into t1 values(null);
 | 
						|
insert into t1 values(null);
 | 
						|
delete from t1 where a=6;
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
insert delayed into t1 values(null);
 | 
						|
FLUSH TABLE t1;
 | 
						|
select * from t1 order by a;
 | 
						|
a
 | 
						|
1
 | 
						|
2
 | 
						|
3
 | 
						|
4
 | 
						|
5
 | 
						|
7
 | 
						|
8
 | 
						|
9
 | 
						|
10
 | 
						|
11
 | 
						|
12
 | 
						|
13
 | 
						|
DROP TABLE t1;
 | 
						|
SET @bug20627_old_auto_increment_offset=
 | 
						|
@@auto_increment_offset;
 | 
						|
SET @bug20627_old_auto_increment_increment=
 | 
						|
@@auto_increment_increment;
 | 
						|
SET @bug20627_old_session_auto_increment_offset=
 | 
						|
@@session.auto_increment_offset;
 | 
						|
SET @bug20627_old_session_auto_increment_increment=
 | 
						|
@@session.auto_increment_increment;
 | 
						|
SET @@auto_increment_offset= 2;
 | 
						|
SET @@auto_increment_increment= 3;
 | 
						|
SET @@session.auto_increment_offset= 4;
 | 
						|
SET @@session.auto_increment_increment= 5;
 | 
						|
CREATE TABLE t1 (
 | 
						|
c1 INT NOT NULL AUTO_INCREMENT,
 | 
						|
PRIMARY KEY (c1)
 | 
						|
);
 | 
						|
INSERT INTO t1 VALUES (NULL),(NULL),(NULL);
 | 
						|
SELECT * FROM t1;
 | 
						|
c1
 | 
						|
4
 | 
						|
9
 | 
						|
14
 | 
						|
DROP TABLE t1;
 | 
						|
CREATE TABLE t1 (
 | 
						|
c1 INT NOT NULL AUTO_INCREMENT,
 | 
						|
PRIMARY KEY (c1)
 | 
						|
);
 | 
						|
INSERT DELAYED INTO t1 VALUES (NULL),(NULL),(NULL);
 | 
						|
FLUSH TABLE t1;
 | 
						|
SELECT * FROM t1;
 | 
						|
c1
 | 
						|
4
 | 
						|
9
 | 
						|
14
 | 
						|
DROP TABLE t1;
 | 
						|
SET             @@auto_increment_offset=
 | 
						|
@bug20627_old_auto_increment_offset;
 | 
						|
SET             @@auto_increment_increment=
 | 
						|
@bug20627_old_auto_increment_increment;
 | 
						|
SET             @@session.auto_increment_offset=
 | 
						|
@bug20627_old_session_auto_increment_offset;
 | 
						|
SET             @@session.auto_increment_increment=
 | 
						|
@bug20627_old_session_auto_increment_increment;
 | 
						|
SET @bug20830_old_auto_increment_offset=
 | 
						|
@@auto_increment_offset;
 | 
						|
SET @bug20830_old_auto_increment_increment=
 | 
						|
@@auto_increment_increment;
 | 
						|
SET @bug20830_old_session_auto_increment_offset=
 | 
						|
@@session.auto_increment_offset;
 | 
						|
SET @bug20830_old_session_auto_increment_increment=
 | 
						|
@@session.auto_increment_increment;
 | 
						|
SET @@auto_increment_offset= 2;
 | 
						|
SET @@auto_increment_increment= 3;
 | 
						|
SET @@session.auto_increment_offset= 4;
 | 
						|
SET @@session.auto_increment_increment= 5;
 | 
						|
CREATE TABLE t1 (
 | 
						|
c1 INT(11) NOT NULL AUTO_INCREMENT,
 | 
						|
c2 INT(11) DEFAULT NULL,
 | 
						|
PRIMARY KEY (c1)
 | 
						|
);
 | 
						|
SET insert_id= 14;
 | 
						|
INSERT INTO t1 VALUES(NULL, 11), (NULL, 12), (NULL, 13);
 | 
						|
INSERT INTO t1 VALUES(NULL, 21), (NULL, 22), (NULL, 23);
 | 
						|
INSERT INTO t1 VALUES(  69, 31), (NULL, 32), (NULL, 33);
 | 
						|
INSERT INTO t1 VALUES(NULL, 41), (NULL, 42), (NULL, 43);
 | 
						|
SET insert_id= 114;
 | 
						|
INSERT INTO t1 VALUES(NULL, 51), (NULL, 52), (NULL, 53);
 | 
						|
INSERT INTO t1 VALUES(NULL, 61), (NULL, 62), (NULL, 63);
 | 
						|
INSERT INTO t1 VALUES(  49, 71), (NULL, 72), (NULL, 73);
 | 
						|
INSERT INTO t1 VALUES(NULL, 81), (NULL, 82), (NULL, 83);
 | 
						|
SET insert_id= 114;
 | 
						|
INSERT INTO t1 VALUES(NULL, 91);
 | 
						|
ERROR 23000: Duplicate entry '114' for key 'PRIMARY'
 | 
						|
INSERT INTO t1 VALUES           (NULL, 92), (NULL, 93);
 | 
						|
SELECT * FROM t1;
 | 
						|
c1	c2
 | 
						|
14	11
 | 
						|
19	12
 | 
						|
24	13
 | 
						|
29	21
 | 
						|
34	22
 | 
						|
39	23
 | 
						|
69	31
 | 
						|
74	32
 | 
						|
79	33
 | 
						|
84	41
 | 
						|
89	42
 | 
						|
94	43
 | 
						|
114	51
 | 
						|
119	52
 | 
						|
124	53
 | 
						|
129	61
 | 
						|
134	62
 | 
						|
139	63
 | 
						|
49	71
 | 
						|
144	72
 | 
						|
149	73
 | 
						|
154	81
 | 
						|
159	82
 | 
						|
164	83
 | 
						|
169	92
 | 
						|
174	93
 | 
						|
SELECT COUNT(*) FROM t1;
 | 
						|
COUNT(*)
 | 
						|
26
 | 
						|
SELECT SUM(c1) FROM t1;
 | 
						|
SUM(c1)
 | 
						|
2569
 | 
						|
DROP TABLE t1;
 | 
						|
CREATE TABLE t1 (
 | 
						|
c1 INT(11) NOT NULL AUTO_INCREMENT,
 | 
						|
c2 INT(11) DEFAULT NULL,
 | 
						|
PRIMARY KEY (c1)
 | 
						|
);
 | 
						|
SET insert_id= 14;
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 11), (NULL, 12), (NULL, 13);
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 21), (NULL, 22), (NULL, 23);
 | 
						|
INSERT DELAYED INTO t1 VALUES(  69, 31), (NULL, 32), (NULL, 33);
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 41), (NULL, 42), (NULL, 43);
 | 
						|
SET insert_id= 114;
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 51), (NULL, 52), (NULL, 53);
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 61), (NULL, 62), (NULL, 63);
 | 
						|
INSERT DELAYED INTO t1 VALUES(  49, 71), (NULL, 72), (NULL, 73);
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 81), (NULL, 82), (NULL, 83);
 | 
						|
SET insert_id= 114;
 | 
						|
INSERT DELAYED INTO t1 VALUES(NULL, 91);
 | 
						|
INSERT DELAYED INTO t1 VALUES           (NULL, 92), (NULL, 93);
 | 
						|
FLUSH TABLE t1;
 | 
						|
SELECT * FROM t1;
 | 
						|
c1	c2
 | 
						|
14	11
 | 
						|
19	12
 | 
						|
24	13
 | 
						|
29	21
 | 
						|
34	22
 | 
						|
39	23
 | 
						|
69	31
 | 
						|
74	32
 | 
						|
79	33
 | 
						|
84	41
 | 
						|
89	42
 | 
						|
94	43
 | 
						|
114	51
 | 
						|
119	52
 | 
						|
124	53
 | 
						|
129	61
 | 
						|
134	62
 | 
						|
139	63
 | 
						|
49	71
 | 
						|
144	72
 | 
						|
149	73
 | 
						|
154	81
 | 
						|
159	82
 | 
						|
164	83
 | 
						|
169	92
 | 
						|
174	93
 | 
						|
SELECT COUNT(*) FROM t1;
 | 
						|
COUNT(*)
 | 
						|
26
 | 
						|
SELECT SUM(c1) FROM t1;
 | 
						|
SUM(c1)
 | 
						|
2569
 | 
						|
DROP TABLE t1;
 | 
						|
SET             @@auto_increment_offset=
 | 
						|
@bug20830_old_auto_increment_offset;
 | 
						|
SET             @@auto_increment_increment=
 | 
						|
@bug20830_old_auto_increment_increment;
 | 
						|
SET             @@session.auto_increment_offset=
 | 
						|
@bug20830_old_session_auto_increment_offset;
 | 
						|
SET             @@session.auto_increment_increment=
 | 
						|
@bug20830_old_session_auto_increment_increment;
 | 
						|
CREATE TABLE t1(a BIT);
 | 
						|
INSERT DELAYED INTO t1 VALUES(1);
 | 
						|
FLUSH TABLE t1;
 | 
						|
SELECT HEX(a) FROM t1;
 | 
						|
HEX(a)
 | 
						|
1
 | 
						|
DROP TABLE t1;
 | 
						|
CREATE TABLE t1 (a INT);
 | 
						|
INSERT DELAYED INTO t1 SET b= b();
 | 
						|
ERROR 42S22: Unknown column 'b' in 'field list'
 | 
						|
DROP TABLE t1;
 | 
						|
End of 5.0 tests
 | 
						|
DROP TABLE IF EXISTS t1,t2;
 | 
						|
SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';
 | 
						|
CREATE TABLE `t1` (
 | 
						|
`id` int(11) PRIMARY KEY auto_increment,
 | 
						|
`f1` varchar(10) NOT NULL UNIQUE
 | 
						|
);
 | 
						|
INSERT DELAYED INTO t1 VALUES(0,"test1");
 | 
						|
SELECT * FROM t1;
 | 
						|
id	f1
 | 
						|
0	test1
 | 
						|
SET SQL_MODE='PIPES_AS_CONCAT';
 | 
						|
INSERT DELAYED INTO t1 VALUES(0,'a' || 'b');
 | 
						|
SELECT * FROM t1;
 | 
						|
id	f1
 | 
						|
0	test1
 | 
						|
1	ab
 | 
						|
SET SQL_MODE='ERROR_FOR_DIVISION_BY_ZERO,STRICT_ALL_TABLES';
 | 
						|
INSERT DELAYED INTO t1 VALUES(mod(1,0),"test3");
 | 
						|
ERROR 22012: Division by 0
 | 
						|
CREATE TABLE t2 (
 | 
						|
`id` int(11) PRIMARY KEY auto_increment,
 | 
						|
`f1` date
 | 
						|
);
 | 
						|
SET SQL_MODE='NO_ZERO_DATE,STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
 | 
						|
INSERT DELAYED INTO t2 VALUES (0,'0000-00-00');
 | 
						|
ERROR 22007: Incorrect date value: '0000-00-00' for column 'f1' at row 1
 | 
						|
INSERT DELAYED INTO t2 VALUES (0,'2007-00-00');
 | 
						|
ERROR 22007: Incorrect date value: '2007-00-00' for column 'f1' at row 1
 | 
						|
DROP TABLE t1,t2;
 | 
						|
set @old_delayed_updates = @@global.low_priority_updates;
 | 
						|
set global low_priority_updates = 1;
 | 
						|
select @@global.low_priority_updates;
 | 
						|
@@global.low_priority_updates
 | 
						|
1
 | 
						|
drop table if exists t1;
 | 
						|
create table t1 (a int, b int);
 | 
						|
insert into t1 values (1,1);
 | 
						|
lock table t1 read;
 | 
						|
connection: update
 | 
						|
insert delayed into t1 values (2,2);;
 | 
						|
connection: select
 | 
						|
select * from t1;
 | 
						|
a	b
 | 
						|
1	1
 | 
						|
connection: default
 | 
						|
select * from t1;
 | 
						|
a	b
 | 
						|
1	1
 | 
						|
unlock tables;
 | 
						|
select * from t1;
 | 
						|
a	b
 | 
						|
1	1
 | 
						|
2	2
 | 
						|
drop table t1;
 | 
						|
set global low_priority_updates = @old_delayed_updates;
 | 
						|
End of 5.1 tests
 |