diff options
| author | unknown <ramil@mysql.com> | 2005-11-21 11:52:58 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-11-21 11:52:58 +0400 |
| commit | f455634cba9c7b949583e64f08b40de6b16e85b3 (patch) | |
| tree | 392853600e7bc4372b8bb4bb92a818134bbc090d /sql/sql_class.h | |
| parent | 32e6e6aac6520dca9af8b6e00a49f25c2f2a4d73 (diff) | |
| download | mariadb-git-f455634cba9c7b949583e64f08b40de6b16e85b3.tar.gz | |
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().
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 ed6f5732ca8..9395252310b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1229,14 +1229,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__ |