1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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
This commit is contained in:
unknown
2005-11-24 13:42:47 +04:00

View File

@ -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__