diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-04-29 16:42:33 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-04-29 16:42:33 +0300 |
| commit | 3594adb165279605c0cf6519f5c3a5b5378f3d91 (patch) | |
| tree | 5013e7c0279115014b75320a87795fe461ac1285 /innobase/trx | |
| parent | b7468a97a2fd4a5500edbbf9884d548f78cbf57c (diff) | |
| download | mariadb-git-3594adb165279605c0cf6519f5c3a5b5378f3d91.tar.gz | |
InnoDB: implement LOCK TABLE (Bug #3299)
innobase/include/lock0lock.h:
Add lock_table_unlock() and lock_release_tables_off_kernel()
Add LOCK_TABLE_EXP
innobase/include/row0mysql.h:
Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/include/trx0trx.h:
Add n_tables_locked
innobase/lock/lock0lock.c:
Add LOCK_TABLE_EXP for explicit LOCK TABLE commands
Add lock_table_unlock()
Add lock_release_tables_off_kernel()
innobase/row/row0mysql.c:
Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/trx/trx0trx.c:
Add n_tables_locked
mysql-test/r/innodb.result:
Updated handling of auto_inc columns
sql/ha_innodb.cc:
Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 7a028c92060..69cd6c7b22d 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -151,6 +151,7 @@ trx_create( trx->n_tickets_to_enter_innodb = 0; trx->auto_inc_lock = NULL; + trx->n_tables_locked = 0; trx->read_view_heap = mem_heap_create(256); trx->read_view = NULL; @@ -278,6 +279,7 @@ trx_free( ut_a(!trx->has_search_latch); ut_a(!trx->auto_inc_lock); + ut_a(!trx->n_tables_locked); ut_a(trx->dict_operation_lock_mode == 0); |