1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Fixed merge errors and XA prepare

This commit is contained in:
Jan Lindström
2013-09-04 08:47:05 +03:00
parent ba3ff50ab2
commit 6e8bfb0b26
4 changed files with 61 additions and 5 deletions

View File

@@ -1155,6 +1155,8 @@ THD::THD()
wsrep_status_vars = 0;
wsrep_mysql_replicated = 0;
wsrep_bf_thd = NULL;
wsrep_TOI_pre_query = NULL;
wsrep_TOI_pre_query_len = 0;
#endif
/* Call to init() below requires fully initialized Open_tables_state. */
reset_open_tables_state(this);