diff options
| author | Monty <monty@mariadb.org> | 2018-03-29 12:25:17 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-03-29 14:20:11 +0300 |
| commit | cd93eeeb1dd2b86ed5111bf16eedee90690e387d (patch) | |
| tree | 8da35071262f69f38ace931b075ea6988de1aeb1 /sql/sql_sequence.cc | |
| parent | e2664ee8362a94335df06edfc86936ff263d6dc0 (diff) | |
| download | mariadb-git-cd93eeeb1dd2b86ed5111bf16eedee90690e387d.tar.gz | |
MDEV-15149 Assert upon concurrent creating / querying sequences
Problem was that sequence_insert closed and reopened the like table
without proper locking. Fixed by ensuring that the like table is
not reopened in sequence_insert
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index cc0691f92cf..3ef1e668667 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -283,6 +283,7 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list) Reprepare_observer *save_reprepare_observer; sequence_definition *seq= lex->create_info.seq_create_info; bool temporary_table= table_list->table != 0; + TABLE_LIST *org_next_global= table_list->next_global; DBUG_ENTER("sequence_insert"); /* If not temporary table */ @@ -290,6 +291,7 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list) { /* Table was locked as part of create table. Free it but keep MDL locks */ close_thread_tables(thd); + table_list->next_global= 0; // Close LIKE TABLE table_list->lock_type= TL_WRITE_DEFAULT; table_list->updating= 1; /* @@ -312,6 +314,7 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list) table_list->open_strategy= save_open_strategy; thd->open_options&= ~HA_OPEN_FOR_CREATE; thd->m_reprepare_observer= save_reprepare_observer; + table_list->next_global= org_next_global; if (error) DBUG_RETURN(TRUE); /* purify inspected */ } |