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

Merge MariaDB 10.0-base to 10.0.

Browse Source
This commit is contained in:
unknown
2014-02-10 15:12:17 +01:00
parent e8193eeb8d f3a6f86ec3
commit dd93ec5633
44 changed files with 1420 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_class.h
View File

@ -55,6 +55,7 @@ void set_thd_stage_info(void *thd,
(thd)->enter_stage(& stage, NULL, __func__, __FILE__, __LINE__)
#include "my_apc.h"
#include "rpl_gtid.h"
class Reprepare_observer;
class Relay_log_info;
@ -3661,6 +3662,12 @@ private:
*/
LEX_STRING invoker_user;
LEX_STRING invoker_host;
/* Protect against add/delete of temporary tables in parallel replication */
void rgi_lock_temporary_tables();
void rgi_unlock_temporary_tables();
bool rgi_have_temporary_tables();
public:
/*
Flag, mutex and condition for a thread to wait for a signal from another
thread.
@ -3671,12 +3678,12 @@ private:
bool wakeup_ready;
mysql_mutex_t LOCK_wakeup_ready;
mysql_cond_t COND_wakeup_ready;
/*
The GTID assigned to the last commit. If no GTID was assigned to any commit
so far, this is indicated by last_commit_gtid.seq_no == 0.
*/
rpl_gtid last_commit_gtid;
/* Protect against add/delete of temporary tables in parallel replication */
void rgi_lock_temporary_tables();
void rgi_unlock_temporary_tables();
bool rgi_have_temporary_tables();
public:
inline void lock_temporary_tables()
{
if (rgi_slave)