From e5f0a861cfdf5c9199f01948f68fd7a955db61f5 Mon Sep 17 00:00:00 2001 From: "ramil@mysql.com" <> Date: Mon, 21 Nov 2005 11:52:58 +0400 Subject: [PATCH] Fix for bug #15047: "server crash when compiling without transaction support". --- sql/sql_class.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/sql_class.h b/sql/sql_class.h index ed6f5732ca8..9395252310b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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__