Commit 222871ca authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/ram/work/5.0.b15047


sql/sql_class.h:
  Auto merged
parents 97bfd41f f455634c

sql/sql_class.h

+4 −2
Original line number Diff line number Diff line
@@ -1230,14 +1230,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__