Merge branch 'mdev-6981-master_gtid_wait-status-variables' of https://github.com/openquery/mariadb-server into danblack

Conflicts:
	sql/mysqld.cc
This commit is contained in:
Kristian Nielsen 2015-03-16 13:41:11 +01:00
commit 0e717c5bf4
5 changed files with 82 additions and 3 deletions

View file

@ -738,6 +738,11 @@ typedef struct system_status_var
ulong feature_trigger; /* +1 opening a table with triggers */
ulong feature_xml; /* +1 when XPATH is used */
/* From MASTER_GTID_WAIT usage */
ulonglong master_gtid_wait_timeouts; /* # of timeouts */
ulonglong master_gtid_wait_time; /* Time in microseconds */
ulonglong master_gtid_wait_count;
ulong empty_queries;
ulong access_denied_errors;
ulong lost_connections;