diff options
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/lock0lock.h | 8 | ||||
| -rw-r--r-- | innobase/include/srv0srv.h | 3 | ||||
| -rw-r--r-- | innobase/include/trx0trx.h | 6 |
3 files changed, 16 insertions, 1 deletions
diff --git a/innobase/include/lock0lock.h b/innobase/include/lock0lock.h index d2d4ce9290d..c492e7b8ef3 100644 --- a/innobase/include/lock0lock.h +++ b/innobase/include/lock0lock.h @@ -396,6 +396,14 @@ lock_release_off_kernel( /*====================*/ trx_t* trx); /* in: transaction */ /************************************************************************* +Resets all locks, both table and record locks, on a table to be dropped. +No lock is allowed to be a wait lock. */ + +void +lock_reset_all_on_table( +/*====================*/ + dict_table_t* table); /* in: table to be dropped */ +/************************************************************************* Calculates the fold value of a page file address: used in inserting or searching for a lock in the hash table. */ UNIV_INLINE diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index a6750e3b277..8853745926d 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -48,6 +48,9 @@ extern dulint srv_archive_recovery_limit_lsn; extern ulint srv_lock_wait_timeout; +extern ibool srv_set_thread_priorities; +extern int srv_query_thread_priority; + /*-------------------------------------------*/ extern ulint srv_n_spin_wait_rounds; extern ulint srv_spin_wait_delay; diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 049dbc1476c..52be0b1d992 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -282,7 +282,11 @@ struct trx_struct{ ulint n_mysql_tables_in_use; /* number of Innobase tables used in the processing of the current SQL statement in MySQL */ - UT_LIST_NODE_T(trx_t) + ibool ignore_duplicates_in_insert; + /* in an insert roll back only insert + of the latest row in case + of a duplicate key error */ + UT_LIST_NODE_T(trx_t) trx_list; /* list of transactions */ /*------------------------------*/ mutex_t undo_mutex; /* mutex protecting the fields in this |