From 38591bca76f3e90fe32dc9661cedd01891574c92 Mon Sep 17 00:00:00 2001
From: unknown <serg@janus.mylan>
Date: Sat, 10 Nov 2007 22:41:43 +0100
Subject: [PATCH] bad merge fixed

---
 sql/sql_class.h | 2 --
 1 file changed, 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;