Skip to content

Commit

Permalink
MDEV-13393 SEQUENCE related crash when running concurrent I_S.TABLES …
Browse files Browse the repository at this point in the history
…and FLUSH queries

Problem was that SEQUENCE::table was shared among threads, which caused
several threads to use the same object at the same time.
  • Loading branch information
montywi committed Aug 7, 2017
1 parent cf9e0bf commit 213af08
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
14 changes: 7 additions & 7 deletions sql/sql_sequence.cc
Expand Up @@ -341,7 +341,7 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *table_list)

/* Create a SQUENCE object */

SEQUENCE::SEQUENCE() :all_values_used(0), initialized(SEQ_UNINTIALIZED), table(0)
SEQUENCE::SEQUENCE() :all_values_used(0), initialized(SEQ_UNINTIALIZED)
{
mysql_rwlock_init(key_LOCK_SEQUENCE, &mutex);
}
Expand Down Expand Up @@ -389,7 +389,7 @@ void SEQUENCE::read_unlock(TABLE *table)
This is called from ha_open() when the table is not yet locked
*/

int SEQUENCE::read_initial_values(TABLE *table_arg)
int SEQUENCE::read_initial_values(TABLE *table)
{
int error= 0;
enum thr_lock_type save_lock_type;
Expand All @@ -398,7 +398,6 @@ int SEQUENCE::read_initial_values(TABLE *table_arg)

if (likely(initialized != SEQ_UNINTIALIZED))
DBUG_RETURN(0);
table= table_arg;
write_lock(table);
if (likely(initialized == SEQ_UNINTIALIZED))
{
Expand Down Expand Up @@ -438,7 +437,8 @@ int SEQUENCE::read_initial_values(TABLE *table_arg)
thd->mdl_context.release_lock(mdl_request.ticket);
DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT);
}
if (!(error= read_stored_values()))
DBUG_ASSERT(table->reginfo.lock_type == TL_READ);
if (!(error= read_stored_values(table)))
initialized= SEQ_READY_TO_USE;
mysql_unlock_tables(thd, lock, 0);
if (mdl_lock_used)
Expand Down Expand Up @@ -467,7 +467,7 @@ int SEQUENCE::read_initial_values(TABLE *table_arg)
Called once from when table is opened
*/

int SEQUENCE::read_stored_values()
int SEQUENCE::read_stored_values(TABLE *table)
{
int error;
my_bitmap_map *save_read_set;
Expand Down Expand Up @@ -621,7 +621,7 @@ int sequence_definition::write(TABLE *table, bool all_fields)
push_warning_printf(WARN_LEVEL_WARN) has been called
 @retval 0 Next number or error. Check error variable
@retval 0 Next number or error. Check error variable
# Next sequence number
NOTES:
Expand Down Expand Up @@ -755,7 +755,7 @@ void SEQUENCE_LAST_VALUE::set_version(TABLE *table)
@param in next_round Round for 'next_value' (in cace of cycles)
@param in is_used 1 if next_val is already used
 @retval 0 ok, value adjusted
@retval 0 ok, value adjusted
1 value was less than current value or
error when storing value
Expand Down
3 changes: 1 addition & 2 deletions sql/sql_sequence.h
Expand Up @@ -93,7 +93,7 @@ class SEQUENCE :public sequence_definition
SEQUENCE();
~SEQUENCE();
int read_initial_values(TABLE *table);
int read_stored_values();
int read_stored_values(TABLE *table);
void write_lock(TABLE *table);
void write_unlock(TABLE *table);
void read_lock(TABLE *table);
Expand Down Expand Up @@ -132,7 +132,6 @@ class SEQUENCE :public sequence_definition
seq_init initialized;

private:
TABLE *table;
mysql_rwlock_t mutex;
};

Expand Down

0 comments on commit 213af08

Please sign in to comment.