Commit f455634c authored by unknown's avatar unknown
Browse files

Fix for bug #15047: "server crash when compiling without transaction support". 


sql/sql_class.h:
  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().
parent 32e6e6aa

sql/sql_class.h

+4 −2
Original line number Diff line number Diff line
@@ -1229,14 +1229,16 @@ class THD :public Statement, 
      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__