diff options
| author | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
|---|---|---|
| committer | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
| commit | ac540e96a915c30034a4fc03ef65b60b8392f664 (patch) | |
| tree | aa7f771761883b28925048ff5e37e2eb85d77c00 /innobase/include/trx0trx.h | |
| parent | 2aa572433b9ce47a511958ce263c8400c2e81ac3 (diff) | |
| download | mariadb-git-ac540e96a915c30034a4fc03ef65b60b8392f664.tar.gz | |
Many files:
Merge InnoDB-.48
sql/ha_innobase.cc:
Merge InnoDB-.48
innobase/include/dict0dict.h:
Merge InnoDB-.48
innobase/include/dict0mem.h:
Merge InnoDB-.48
innobase/include/mem0dbg.h:
Merge InnoDB-.48
innobase/include/mem0mem.h:
Merge InnoDB-.48
innobase/include/que0que.h:
Merge InnoDB-.48
innobase/include/row0mysql.h:
Merge InnoDB-.48
innobase/include/srv0srv.h:
Merge InnoDB-.48
innobase/include/trx0sys.h:
Merge InnoDB-.48
innobase/include/trx0trx.h:
Merge InnoDB-.48
innobase/include/mem0mem.ic:
Merge InnoDB-.48
innobase/dict/dict0dict.c:
Merge InnoDB-.48
innobase/dict/dict0mem.c:
Merge InnoDB-.48
innobase/log/log0recv.c:
Merge InnoDB-.48
innobase/mem/mem0dbg.c:
Merge InnoDB-.48
innobase/mem/mem0mem.c:
Merge InnoDB-.48
innobase/pars/lexyy.c:
Merge InnoDB-.48
innobase/que/que0que.c:
Merge InnoDB-.48
innobase/rem/rem0rec.c:
Merge InnoDB-.48
innobase/row/row0mysql.c:
Merge InnoDB-.48
innobase/row/row0sel.c:
Merge InnoDB-.48
innobase/srv/srv0srv.c:
Merge InnoDB-.48
innobase/sync/sync0arr.c:
Merge InnoDB-.48
innobase/trx/trx0sys.c:
Merge InnoDB-.48
innobase/trx/trx0trx.c:
Merge InnoDB-.48
innobase/trx/trx0undo.c:
Merge InnoDB-.48
Diffstat (limited to 'innobase/include/trx0trx.h')
| -rw-r--r-- | innobase/include/trx0trx.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index 58cef01b376..d67628b8bad 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -290,10 +290,20 @@ struct trx_struct{ table */ dulint table_id; /* table id if the preceding field is TRUE */ + /*------------------------------*/ void* mysql_thd; /* MySQL thread handle corresponding to this trx, or NULL */ + char* mysql_log_file_name; + /* If MySQL binlog is used, this field + contains a pointer to the latest file + name; this is NULL if binlog is not + used */ + ib_longlong mysql_log_offset;/* If MySQL binlog is used, this field + contains the end offset of the binlog + entry */ os_thread_id_t mysql_thread_id;/* id of the MySQL thread associated with this transaction object */ + /*------------------------------*/ ulint n_mysql_tables_in_use; /* number of Innobase tables used in the processing of the current SQL statement in MySQL */ @@ -314,6 +324,18 @@ struct trx_struct{ calls from MySQL; this is intended to reduce contention on the search latch */ + /*------------------------------*/ + ibool declared_to_be_inside_innodb; + /* this is TRUE if we have declared + this transaction in + srv_conc_enter_innodb to be inside the + InnoDB engine */ + ulint n_tickets_to_enter_innodb; + /* this can be > 0 only when + declared_to_... is TRUE; when we come + to srv_conc_innodb_enter, if the value + here is > 0, we decrement this by 1 */ + /*------------------------------*/ lock_t* auto_inc_lock; /* possible auto-inc lock reserved by the transaction; note that it is also in the lock list trx_locks */ |