diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
| commit | fdff9c0a4521e4006eb7dd718e19077afe6fbb37 (patch) | |
| tree | 4a4e924d33acb60a72c034f4b7ff58112c07d6dd /innobase/include/trx0trx.h | |
| parent | 1da42e7b8a4219827f4f435d837f41b1b1919d51 (diff) | |
| parent | 2197533b9b04a76f275e23a24449687089a1c528 (diff) | |
| download | mariadb-git-fdff9c0a4521e4006eb7dd718e19077afe6fbb37.tar.gz | |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'innobase/include/trx0trx.h')
| -rw-r--r-- | innobase/include/trx0trx.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 52be0b1d992..f67ba43162d 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -24,6 +24,13 @@ saving CPU time. The kernel mutex contention is increased, however. */ extern ulint trx_n_mysql_transactions; +/************************************************************************ +Releases the search latch if trx has reserved it. */ + +void +trx_search_latch_release_if_reserved( +/*=================================*/ + trx_t* trx); /* in: transaction */ /******************************************************************** Retrieves the error_info field from a trx. */ @@ -282,6 +289,13 @@ struct trx_struct{ ulint n_mysql_tables_in_use; /* number of Innobase tables used in the processing of the current SQL statement in MySQL */ + ulint mysql_n_tables_locked; + /* how many tables the current SQL + statement uses, except those + in consistent read */ + ibool has_search_latch; + /* TRUE if this trx has latched the + search system latch in S-mode */ ibool ignore_duplicates_in_insert; /* in an insert roll back only insert of the latest row in case |