1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #28780 report_host is not available through SELECT @@report_host

Browse Source 
merging and post-make-test changes.


mysql-test/suite/rpl/r/rpl_report.result:
  results changed
mysql-test/suite/rpl/t/rpl_report.test:
  correcting test because of non-deterministic select's result
sql/set_var.cc:
  compilation issue
This commit is contained in:
unknown 2008-03-07 14:39:37 +02:00
parent 43f15ec126
commit f613588c2b
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/suite/rpl/r/rpl_report.result
View File

@ -4,24 +4,30 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
select * from Information_schema.GLOBAL_VARIABLES where variable_name regexp 'report_\(host\|port\|user\|password\)'; select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_host';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
REPORT_HOST 127.0.0.1 REPORT_HOST 127.0.0.1
select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_port';
VARIABLE_NAME VARIABLE_VALUE
REPORT_PORT 9308 REPORT_PORT 9308
REPORT_PASSWORD my_password select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_user';
VARIABLE_NAME VARIABLE_VALUE
REPORT_USER my_user REPORT_USER my_user
select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_password';
VARIABLE_NAME VARIABLE_VALUE
REPORT_PASSWORD my_password
show global variables like 'report_host'; show global variables like 'report_host';
Variable_name Value Variable_name report_host
report_host 127.0.0.1 Value 127.0.0.1
show global variables like 'report_port'; show global variables like 'report_port';
Variable_name Value Variable_name report_port
report_port 9308 Value 9308
show global variables like 'report_user'; show global variables like 'report_user';
Variable_name Value Variable_name report_user
report_user my_user Value my_user
show global variables like 'report_password'; show global variables like 'report_password';
Variable_name Value Variable_name report_password
report_password my_password Value my_password
set @@global.report_host='my.new.address.net'; set @@global.report_host='my.new.address.net';
ERROR HY000: Variable 'report_host' is a read only variable ERROR HY000: Variable 'report_host' is a read only variable
end of tests end of tests

13
mysql-test/suite/rpl/t/rpl_report.test
View File

@ -4,11 +4,14 @@
source include/master-slave.inc; source include/master-slave.inc;
connection slave; connection slave;
select * from Information_schema.GLOBAL_VARIABLES where variable_name regexp 'report_\(host\|port\|user\|password\)'; select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_host';
show global variables like 'report_host'; select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_port';
show global variables like 'report_port'; select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_user';
show global variables like 'report_user'; select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_password';
show global variables like 'report_password'; query_vertical show global variables like 'report_host';
query_vertical show global variables like 'report_port';
query_vertical show global variables like 'report_user';
query_vertical show global variables like 'report_password';
# to demonstrate that report global variables are read-only # to demonstrate that report global variables are read-only
error ER_INCORRECT_GLOBAL_LOCAL_VAR; error ER_INCORRECT_GLOBAL_LOCAL_VAR;

4
sql/set_var.cc
View File

@ -648,6 +648,8 @@ sys_var_thd_time_zone sys_time_zone(&vars, "time_zone");
/* Global read-only variable containing hostname */ /* Global read-only variable containing hostname */
static sys_var_const_str sys_hostname(&vars, "hostname", glob_hostname); static sys_var_const_str sys_hostname(&vars, "hostname", glob_hostname);
#ifndef EMBEDDED_LIBRARY
static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host); static sys_var_const_str_ptr sys_repl_report_host(&vars, "report_host", &report_host);
static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user); static sys_var_const_str_ptr sys_repl_report_user(&vars, "report_user", &report_user);
static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password); static sys_var_const_str_ptr sys_repl_report_password(&vars, "report_password", &report_password);
@ -660,7 +662,7 @@ static uchar *slave_get_report_port(THD *thd)
static sys_var_readonly sys_repl_report_port(&vars, "report_port", OPT_GLOBAL, SHOW_INT, slave_get_report_port); static sys_var_readonly sys_repl_report_port(&vars, "report_port", OPT_GLOBAL, SHOW_INT, slave_get_report_port);
#endif
sys_var_thd_bool sys_keep_files_on_create(&vars, "keep_files_on_create", sys_var_thd_bool sys_keep_files_on_create(&vars, "keep_files_on_create",
&SV::keep_files_on_create); &SV::keep_files_on_create);