bk commit into 5.1 tree (serg:1.2606)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-10 22:41:43+01:00, serg@stripped +1 -0
  bad merge fixed

  sql/sql_class.h@stripped, 2007-11-10 22:41:40+01:00, serg@stripped +0 -2
    bad merge fixed

diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2007-10-23 16:02:25 +02:00
+++ b/sql/sql_class.h	2007-11-10 22:41:40 +01:00
@@ -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;