From: Date: November 21 2005 8:53am
Subject: bk commit into 5.0 tree (ramil:1.1981) BUG#15047
List-Archive: http://lists.mysql.com/internals/32445
X-Bug: 15047
Message-Id: <200511210753.jAL7rBKm091856@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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
  1.1981 05/11/21 11:52:58 ramil@stripped +1 -0
  Fix for bug #15047: "server crash when compiling without transaction support".

  sql/sql_class.h
    1.275 05/11/21 11:52:15 ramil@stripped +4 -2
    Fix for bug #15047: "server crash when compiling without transaction support".
    - set xid_state.xa_state to XA_NOTR in absence of transactional engines,
      as we check it in the end_trans() which is always called from the ha_enable_transaction().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/5.0.b15047

--- 1.274/sql/sql_class.h	2005-11-19 16:11:49 +04:00
+++ 1.275/sql/sql_class.h	2005-11-21 11:52:15 +04:00
@@ -1229,14 +1229,16 @@ public:
       free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
 #endif
     }
-#ifdef USING_TRANSACTIONS
     st_transactions()
     {
+#ifdef USING_TRANSACTIONS
       bzero((char*)this, sizeof(*this));
       xid_state.xid.null();
       init_sql_alloc(&mem_root, ALLOC_ROOT_MIN_BLOCK_SIZE, 0);
-    }
+#else
+      xid_state.xa_state= XA_NOTR;
 #endif
+    }
   } transaction;
   Field      *dupp_field;
 #ifndef __WIN__