diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 00:53:24 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 00:53:24 +0200 |
| commit | eee5f15b92f71c74ce315932770a603e4deef477 (patch) | |
| tree | b39cfbb54d66b05cd075839aa58dc3215c8d4146 /innobase/trx | |
| parent | d57d78ac10980e28344f285bdbc986fa3ee3496e (diff) | |
| parent | b940ae1012b00e74e2155c4e35ca7872bed278e3 (diff) | |
| download | mariadb-git-eee5f15b92f71c74ce315932770a603e4deef477.tar.gz | |
manual merged (blame me!)
Build-tools/Do-compile:
Auto merged
Docs/Makefile.am:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0arr.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/innodb.result:
to be fixed after the merge
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0trx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index a9aae48dae6..f7497ac4090 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -151,7 +151,7 @@ trx_create( trx->n_tickets_to_enter_innodb = 0; trx->auto_inc_lock = NULL; - trx->n_tables_locked = 0; + trx->n_lock_table_exp = 0; trx->read_view_heap = mem_heap_create(256); trx->read_view = NULL; @@ -279,7 +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->n_lock_table_exp); ut_a(trx->dict_operation_lock_mode == 0); |