diff options
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index ce95d7baeeb..fdb9c647727 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -1,5 +1,6 @@ /* Copyright (c) 2017, MariaDB Corporation, Alibaba Corporation + Copyrgiht (c) 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,20 +52,20 @@ struct Field_definition static Field_definition sequence_structure[]= { - {"next_not_cached_value", 21, &type_handler_longlong, + {"next_not_cached_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, - {"minimum_value", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, FL}, - {"maximum_value", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, FL}, - {"start_value", 21, &type_handler_longlong, {STRING_WITH_LEN("start value when sequences is created or value if RESTART is used")}, FL}, - {"increment", 21, &type_handler_longlong, + {"minimum_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, + {"maximum_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("")}, FL}, + {"start_value", 21, &type_handler_slonglong, {STRING_WITH_LEN("start value when sequences is created or value if RESTART is used")}, FL}, + {"increment", 21, &type_handler_slonglong, {STRING_WITH_LEN("increment value")}, FL}, - {"cache_size", 21, &type_handler_longlong, {STRING_WITH_LEN("")}, + {"cache_size", 21, &type_handler_ulonglong, {STRING_WITH_LEN("")}, FL | UNSIGNED_FLAG}, - {"cycle_option", 1, &type_handler_tiny, {STRING_WITH_LEN("0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed")}, + {"cycle_option", 1, &type_handler_utiny, {STRING_WITH_LEN("0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed")}, FL | UNSIGNED_FLAG }, - {"cycle_count", 21, &type_handler_longlong, + {"cycle_count", 21, &type_handler_slonglong, {STRING_WITH_LEN("How many cycles have been done")}, FL}, - {NULL, 0, &type_handler_longlong, {STRING_WITH_LEN("")}, 0} + {NULL, 0, &type_handler_slonglong, {STRING_WITH_LEN("")}, 0} }; #undef FL @@ -320,8 +321,7 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *org_table_list) if (!temporary_table) { /* - The following code works like open_system_tables_for_read() and - close_system_tables() + The following code works like open_system_tables_for_read() The idea is: - Copy the table_list object for the sequence that was created - Backup the current state of open tables and create a new @@ -375,10 +375,10 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *org_table_list) error= seq->write_initial_sequence(table); { uint save_unsafe_rollback_flags= - thd->transaction.stmt.m_unsafe_rollback_flags; + thd->transaction->stmt.m_unsafe_rollback_flags; if (trans_commit_stmt(thd)) error= 1; - thd->transaction.stmt.m_unsafe_rollback_flags= + thd->transaction->stmt.m_unsafe_rollback_flags= save_unsafe_rollback_flags; } if (trans_commit_implicit(thd)) @@ -463,11 +463,11 @@ int SEQUENCE::read_initial_values(TABLE *table) MYSQL_LOCK *lock; bool mdl_lock_used= 0; THD *thd= table->in_use; - bool has_active_transaction= !thd->transaction.stmt.is_empty(); + bool has_active_transaction= !thd->transaction->stmt.is_empty(); /* There is already a mdl_ticket for this table. However, for list_fields the MDL lock is of type MDL_SHARED_HIGH_PRIO which is not usable - for doing a able lock. Get a proper read lock to solve this. + for doing a table lock. Get a proper read lock to solve this. */ if (table->mdl_ticket == 0) { @@ -478,10 +478,9 @@ int SEQUENCE::read_initial_values(TABLE *table) where we don't have a mdl lock on the table */ - mdl_request.init(MDL_key::TABLE, - table->s->db.str, - table->s->table_name.str, - MDL_SHARED_READ, MDL_EXPLICIT); + MDL_REQUEST_INIT(&mdl_request, MDL_key::TABLE, table->s->db.str, + table->s->table_name.str, MDL_SHARED_READ, + MDL_EXPLICIT); mdl_requests.push_front(&mdl_request); if (thd->mdl_context.acquire_locks(&mdl_requests, thd->variables.lock_wait_timeout)) @@ -499,7 +498,7 @@ int SEQUENCE::read_initial_values(TABLE *table) thd->mdl_context.release_lock(mdl_request.ticket); write_unlock(table); - if (!has_active_transaction && !thd->transaction.stmt.is_empty() && + if (!has_active_transaction && !thd->transaction->stmt.is_empty() && !thd->in_sub_stmt) trans_commit_stmt(thd); DBUG_RETURN(HA_ERR_LOCK_WAIT_TIMEOUT); @@ -521,7 +520,7 @@ int SEQUENCE::read_initial_values(TABLE *table) But we also don't want to commit the stmt transaction while in a substatement, see MDEV-15977. */ - if (!has_active_transaction && !thd->transaction.stmt.is_empty() && + if (!has_active_transaction && !thd->transaction->stmt.is_empty() && !thd->in_sub_stmt) trans_commit_stmt(thd); } @@ -610,7 +609,6 @@ void sequence_definition::adjust_values(longlong next_value) int sequence_definition::write_initial_sequence(TABLE *table) { int error; - THD *thd= table->in_use; MY_BITMAP *save_write_set; store_fields(table); @@ -618,15 +616,14 @@ int sequence_definition::write_initial_sequence(TABLE *table) table->s->sequence->copy(this); /* Sequence values will be replicated as a statement - like 'create sequence'. So disable binary log temporarily + like 'create sequence'. So disable row logging for this table & statement */ - tmp_disable_binlog(thd); + table->file->row_logging= table->file->row_logging_init= 0; save_write_set= table->write_set; table->write_set= &table->s->all_set; table->s->sequence->initialized= SEQUENCE::SEQ_IN_PREPARE; error= table->file->ha_write_row(table->record[0]); table->s->sequence->initialized= SEQUENCE::SEQ_UNINTIALIZED; - reenable_binlog(thd); table->write_set= save_write_set; if (unlikely(error)) table->file->print_error(error, MYF(0)); @@ -968,6 +965,8 @@ bool Sql_cmd_alter_sequence::execute(THD *thd) table= first_table->table; seq= table->s->sequence; + + seq->write_lock(table); new_seq->reserved_until= seq->reserved_until; /* Copy from old sequence those fields that the user didn't specified */ @@ -1000,18 +999,18 @@ bool Sql_cmd_alter_sequence::execute(THD *thd) first_table->db.str, first_table->table_name.str); error= 1; + seq->write_unlock(table); goto end; } - table->s->sequence->write_lock(table); if (likely(!(error= new_seq->write(table, 1)))) { /* Store the sequence values in table share */ - table->s->sequence->copy(new_seq); + seq->copy(new_seq); } else table->file->print_error(error, MYF(0)); - table->s->sequence->write_unlock(table); + seq->write_unlock(table); { wait_for_commit* suspended_wfc= thd->suspend_subsequent_commits(); if (trans_commit_stmt(thd)) |