database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-14762 Server crashes in MDL_ticket::has_stronger_or_equal_type upon inserting into temporary sequence

Browse Source 
Fix is to not upgrade MDL locks for temporary tables
This commit is contained in:
Michael Widenius
2018-04-05 15:16:20 +03:00
parent 3dd01669b4
commit d8da97b09a
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/sql_sequence/temporary.result
View File

@ -10,3 +10,10 @@ select * from s1;
next_not_cached_value minimum_value maximum_value start_value increment cache_size cycle_option cycle_count next_not_cached_value minimum_value maximum_value start_value increment cache_size cycle_option cycle_count
1001 1 9223372036854775806 1 1 1000 0 0 1001 1 9223372036854775806 1 1 1000 0 0
drop temporary sequence s1; drop temporary sequence s1;
#
# MDEV-14762 Server crashes in MDL_ticket::has_stronger_or_equal_type
# upon inserting into temporary sequence
#
CREATE TEMPORARY SEQUENCE s1 ENGINE=InnoDB;
INSERT INTO s1 VALUES (1, 1, 1000, 1, 1, 1, 1, 0);
DROP TEMPORARY SEQUENCE s1;

9
mysql-test/suite/sql_sequence/temporary.test
View File

@ -14,3 +14,12 @@ alter table s1 engine myisam;
select nextval(s1); select nextval(s1);
select * from s1; select * from s1;
drop temporary sequence s1; drop temporary sequence s1;
--echo #
--echo # MDEV-14762 Server crashes in MDL_ticket::has_stronger_or_equal_type
--echo # upon inserting into temporary sequence
--echo #
CREATE TEMPORARY SEQUENCE s1 ENGINE=InnoDB;
INSERT INTO s1 VALUES (1, 1, 1000, 1, 1, 1, 1, 0);
DROP TEMPORARY SEQUENCE s1;

9
sql/ha_sequence.cc
View File

@ -237,9 +237,12 @@ int ha_sequence::write_row(uchar *buf)
THD *thd= table->in_use; THD *thd= table->in_use;
if (thd->lock->table_count != 1) if (thd->lock->table_count != 1)
DBUG_RETURN(ER_WRONG_INSERT_INTO_SEQUENCE); DBUG_RETURN(ER_WRONG_INSERT_INTO_SEQUENCE);
if (thd->mdl_context.upgrade_shared_lock(table->mdl_ticket, MDL_EXCLUSIVE, if (table->s->tmp_table == NO_TMP_TABLE &&
thd->variables.lock_wait_timeout)) thd->mdl_context.upgrade_shared_lock(table->mdl_ticket,
DBUG_RETURN(ER_LOCK_WAIT_TIMEOUT); MDL_EXCLUSIVE,
thd->variables.
lock_wait_timeout))
DBUG_RETURN(ER_LOCK_WAIT_TIMEOUT);
tmp_seq.read_fields(table); tmp_seq.read_fields(table);
if (tmp_seq.check_and_adjust(0)) if (tmp_seq.check_and_adjust(0))