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 tag 'mariadb-5.5.45' into 5.5-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-08-07 17:02:51 -04:00
parent af2f7ce3f9 fa51f70dc6
commit 5b9dd459fb
95 changed files with 3002 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_class.h
View File

@ -59,7 +59,6 @@ struct wsrep_thd_shadow {
#endif
class Reprepare_observer;
class Relay_log_info;
class Query_log_event;
class Load_log_event;
class Slave_log_event;
@ -71,6 +70,7 @@ class Rows_log_event;
class Sroutine_hash_entry;
class User_level_lock;
class user_var_entry;
struct Trans_binlog_info;
enum enum_enable_or_disable { LEAVE_AS_IS, ENABLE, DISABLE };
enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY, RNEXT_SAME };
@ -1689,6 +1689,9 @@ public:
*/
const char *where;
/* Needed by MariaDB semi sync replication */
Trans_binlog_info *semisync_info;
ulong client_capabilities; /* What the client supports */
ulong max_client_packet_length;
@ -1752,11 +1755,11 @@ public:
/* Do not set socket timeouts for wait_timeout (used with threadpool) */
bool skip_wait_timeout;
/* container for handler's private per-connection data */
Ha_data ha_data[MAX_HA];
bool prepare_derived_at_open;
/* Set to 1 if status of this THD is already in global status */
bool status_in_global;
/*
To signal that the tmp table to be created is created for materialized
derived table or a view.
@ -1765,6 +1768,9 @@ public:
bool save_prep_leaf_list;
/* container for handler's private per-connection data */
Ha_data ha_data[MAX_HA];
#ifndef MYSQL_CLIENT
binlog_cache_mngr * binlog_setup_trx_data();
@ -3175,6 +3181,8 @@ public:
{
mysql_mutex_lock(&LOCK_status);
add_to_status(&global_status_var, &status_var);
/* Mark that this THD status has already been added in global status */
status_in_global= 1;
mysql_mutex_unlock(&LOCK_status);
}