bad merge fixed

abf2ae83 · serg@janus.mylan · c3e7f14b · abf2ae83
Commit abf2ae83 authored Nov 10, 2007 by serg@janus.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/sql_class.h sql/sql_class.h +0 -2

No files found.
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1171,8 +1171,6 @@ class THD :public Statement,
    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;