Commit d7457386 authored by serg@janus.mylan's avatar serg@janus.mylan
Browse files

merged

parents 09012c2f b9785bbc

mysql-test/r/variables.result

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ set GLOBAL myisam_max_sort_file_size=default; 
show global variables like 'myisam_max_sort_file_size';

Variable_name	Value

myisam_max_sort_file_size	FILE_SIZE

select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';

select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';

VARIABLE_NAME	VARIABLE_VALUE

MYISAM_MAX_SORT_FILE_SIZE	FILE_SIZE

set global net_retry_count=10, session net_retry_count=10;

mysql-test/t/variables.test

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ set GLOBAL myisam_max_sort_file_size=default; 
--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE

show global variables like 'myisam_max_sort_file_size';

--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE

select * from information_schema.session_variables where variable_name like 'myisam_max_sort_file_size';

select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';



set global net_retry_count=10, session net_retry_count=10;

set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;

sql/mysqld.cc

+2 −0
Original line number Diff line number Diff line
@@ -2863,6 +2863,8 @@ SHOW_VAR com_status_vars[]= { 
#endif

  {"show_procedure_status",(char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS_PROC]), SHOW_LONG_STATUS},

  {"show_processlist",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROCESSLIST]), SHOW_LONG_STATUS},

  {"show_profile",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILE]), SHOW_LONG_STATUS},

  {"show_profiles",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILES]), SHOW_LONG_STATUS},

  {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},

  {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},

  {"show_status",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS]), SHOW_LONG_STATUS},