summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3aa0c5ae9c7..7f44a4b468a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -533,6 +533,11 @@ typedef struct system_variables
thread the query is being run to replicate temp tables properly
*/
my_thread_id pseudo_thread_id;
+ /**
+ Place holder to store sql_slave_skip_counter in sys_var.cc during
+ update and show of variables.
+ */
+ uint slave_skip_counter;
my_bool low_priority_updates;
my_bool query_cache_wlock_invalidate;
@@ -557,6 +562,9 @@ typedef struct system_variables
CHARSET_INFO *collation_database;
CHARSET_INFO *collation_connection;
+ /* Names. These will be allocated in buffers in thd */
+ LEX_STRING default_master_connection;
+
/* Error messages */
MY_LOCALE *lc_messages;
/* Locale Support */
@@ -2192,6 +2200,8 @@ public:
/* scramble - random string sent to client on handshake */
char scramble[SCRAMBLE_LENGTH+1];
+ LEX_STRING connection_name; /* If slave */
+ char default_master_connection_buff[MAX_CONNECTION_NAME+1];
bool slave_thread, one_shot_set;
bool extra_port; /* If extra connection */