database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fixing embedded: first set of changes (storage engines don't work yet)

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-26 17:02:47 +02:00
parent c6b95222c3
commit 8877adb773
4 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_class.cc
View File

@ -891,15 +891,6 @@ THD::THD(bool is_wsrep_applier)
bootstrap(0),
derived_tables_processing(FALSE),
spcont(NULL),
#ifdef WITH_WSREP
wsrep_applier(is_wsrep_applier),
wsrep_applier_closing(false),
wsrep_client_thread(false),
wsrep_apply_toi(false),
wsrep_po_handle(WSREP_PO_INITIALIZER),
wsrep_po_cnt(0),
wsrep_apply_format(0),
#endif
m_parser_state(NULL),
#if defined(ENABLED_DEBUG_SYNC)
debug_sync_control(0),
@ -907,6 +898,15 @@ THD::THD(bool is_wsrep_applier)
wait_for_commit_ptr(0),
main_da(0, false, false),
m_stmt_da(&main_da)
#ifdef WITH_WSREP
,wsrep_applier(is_wsrep_applier)
,wsrep_applier_closing(false)
,wsrep_client_thread(false)
,wsrep_apply_toi(false)
,wsrep_po_handle(WSREP_PO_INITIALIZER)
,wsrep_po_cnt(0)
,wsrep_apply_format(0)
#endif
{
ulong tmp;
@ -1030,6 +1030,7 @@ THD::THD(bool is_wsrep_applier)
wsrep_mysql_replicated = 0;
wsrep_TOI_pre_query = NULL;
wsrep_TOI_pre_query_len = 0;
wsrep_info[sizeof(wsrep_info) - 1] = '\0'; /* make sure it is 0-terminated */
#endif
/* Call to init() below requires fully initialized Open_tables_state. */
reset_open_tables_state(this);
@ -1072,8 +1073,6 @@ THD::THD(bool is_wsrep_applier)
thr_lock_info_init(&lock_info); /* safety: will be reset after start */
lock_info.mysql_thd= (void *)this;
wsrep_info[sizeof(wsrep_info) - 1] = '\0'; /* make sure it is 0-terminated */
m_internal_handler= NULL;
m_binlog_invoker= INVOKER_NONE;
arena_for_cached_items= 0;