diff options
| author | unknown <serg@janus.mylan> | 2007-11-10 22:41:43 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-11-10 22:41:43 +0100 |
| commit | 38591bca76f3e90fe32dc9661cedd01891574c92 (patch) | |
| tree | 7fbd611d456472e0ab2adce2def7a3c05375e308 /sql/sql_class.h | |
| parent | 7599cefca638688b45d4127452db4a9477bd31cb (diff) | |
| download | mariadb-git-38591bca76f3e90fe32dc9661cedd01891574c92.tar.gz | |
bad merge fixed
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c286a87653c..b12cd1beaf5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1171,8 +1171,6 @@ public: THD_TRANS all; // Trans since BEGIN WORK THD_TRANS stmt; // Trans for current statement bool on; // see ha_enable_transaction() - XID xid; // transaction identifier - enum xa_states xa_state; // used by external XA only XID_STATE xid_state; Rows_log_event *m_pending_rows_event; |