1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

bzr merge -rtag:mariadb-10.0.14 maria/10.0/

This commit is contained in:
Nirbhay Choubey
2014-09-28 20:43:56 -04:00
1725 changed files with 61215 additions and 76409 deletions

View File

@ -531,6 +531,14 @@ typedef struct system_variables
ulonglong sortbuff_size;
ulonglong group_concat_max_len;
ulonglong default_regex_flags;
/**
Place holders to store Multi-source variables in sys_var.cc during
update and show of variables.
*/
ulonglong slave_skip_counter;
ulonglong max_relay_log_size;
ha_rows select_limit;
ha_rows max_join_size;
ha_rows expensive_subquery_limit;
@ -599,12 +607,6 @@ typedef struct system_variables
*/
uint32 gtid_domain_id;
uint64 gtid_seq_no;
/**
Place holders to store Multi-source variables in sys_var.cc during
update and show of variables.
*/
ulong slave_skip_counter;
ulong max_relay_log_size;
/**
Default transaction access mode. READ ONLY (true) or READ WRITE (false).