Commit c0cdfe85 authored by ramil@mysql.com's avatar ramil@mysql.com

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

into  mysql.com:/usr/home/ram/work/5.0.b15047
parents f5804869 e5f0a861
...@@ -1230,14 +1230,16 @@ public: ...@@ -1230,14 +1230,16 @@ public:
free_root(&mem_root,MYF(MY_KEEP_PREALLOC)); free_root(&mem_root,MYF(MY_KEEP_PREALLOC));
#endif #endif
} }
#ifdef USING_TRANSACTIONS
st_transactions() st_transactions()
{ {
#ifdef USING_TRANSACTIONS
bzero((char*)this, sizeof(*this)); bzero((char*)this, sizeof(*this));
xid_state.xid.null(); xid_state.xid.null();
init_sql_alloc(&mem_root, ALLOC_ROOT_MIN_BLOCK_SIZE, 0); init_sql_alloc(&mem_root, ALLOC_ROOT_MIN_BLOCK_SIZE, 0);
} #else
xid_state.xa_state= XA_NOTR;
#endif #endif
}
} transaction; } transaction;
Field *dupp_field; Field *dupp_field;
#ifndef __WIN__ #ifndef __WIN__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment