diff options
| author | unknown <ramil@mysql.com> | 2005-11-24 13:42:47 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-11-24 13:42:47 +0400 |
| commit | 2f4e896de9c74e2113351eda51f30a23389b7162 (patch) | |
| tree | 94f97388f0b6d6f4587add6d7afc535cd6900d46 /sql/sql_class.h | |
| parent | 6eed9d51de6b2f1b3cc357be613318bf6815cccd (diff) | |
| parent | eb8e3addda2ff9489ddde488fc807cd66f4bb68e (diff) | |
| download | mariadb-git-2f4e896de9c74e2113351eda51f30a23389b7162.tar.gz | |
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
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0346801b0dc..33be70ee674 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1230,14 +1230,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__ |