database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

bad merge fixed

Browse Source
This commit is contained in:
unknown
2007-11-10 22:41:43 +01:00
parent 7599cefca6
commit 38591bca76
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@ -1171,8 +1171,6 @@ public:
THD_TRANS all; // Trans since BEGIN WORK THD_TRANS all; // Trans since BEGIN WORK
THD_TRANS stmt; // Trans for current statement THD_TRANS stmt; // Trans for current statement
bool on; // see ha_enable_transaction() bool on; // see ha_enable_transaction()
XID xid; // transaction identifier
enum xa_states xa_state; // used by external XA only
XID_STATE xid_state; XID_STATE xid_state;
Rows_log_event *m_pending_rows_event; Rows_log_event *m_pending_rows_event;