bk commit into 5.1 tree (aelkin:1.2561) BUG#28780

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of aelkin.  When aelkin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-07 14:39:37+02:00, aelkin@mysql1000.(none) +3 -0
  Bug #28780 report_host is not available through SELECT @@report_host
  
  merging and post-make-test changes.

  mysql-test/suite/rpl/r/rpl_report.result@stripped, 2008-03-07 14:39:35+02:00,
aelkin@mysql1000.(none) +16 -10
    results changed

  mysql-test/suite/rpl/t/rpl_report.test@stripped, 2008-03-07 14:39:35+02:00,
aelkin@mysql1000.(none) +8 -5
    correcting test because of non-deterministic select's result

  sql/set_var.cc@stripped, 2008-03-07 14:39:35+02:00, aelkin@mysql1000.(none) +3 -1
    compilation issue

diff -Nrup a/mysql-test/suite/rpl/r/rpl_report.result
b/mysql-test/suite/rpl/r/rpl_report.result
--- a/mysql-test/suite/rpl/r/rpl_report.result	2008-03-05 12:25:53 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_report.result	2008-03-07 14:39:35 +02:00
@@ -4,24 +4,30 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 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
 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_PASSWORD	my_password
+select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_user';
+VARIABLE_NAME	VARIABLE_VALUE
 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';
-Variable_name	Value
-report_host	127.0.0.1
+Variable_name	report_host
+Value	127.0.0.1
 show global variables like 'report_port';
-Variable_name	Value
-report_port	9308
+Variable_name	report_port
+Value	9308
 show global variables like 'report_user';
-Variable_name	Value
-report_user	my_user
+Variable_name	report_user
+Value	my_user
 show global variables like 'report_password';
-Variable_name	Value
-report_password	my_password
+Variable_name	report_password
+Value	my_password
 set @@global.report_host='my.new.address.net';
 ERROR HY000: Variable 'report_host' is a read only variable
 end of tests
diff -Nrup a/mysql-test/suite/rpl/t/rpl_report.test
b/mysql-test/suite/rpl/t/rpl_report.test
--- a/mysql-test/suite/rpl/t/rpl_report.test	2008-03-05 12:25:53 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_report.test	2008-03-07 14:39:35 +02:00
@@ -4,11 +4,14 @@
 source include/master-slave.inc;
 
 connection slave;
-select * from Information_schema.GLOBAL_VARIABLES where variable_name regexp
'report_\(host\|port\|user\|password\)';
-show global variables like 'report_host';
-show global variables like 'report_port';
-show global variables like 'report_user';
-show global variables like 'report_password';
+select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_host';
+select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_port';
+select * from Information_schema.GLOBAL_VARIABLES where variable_name like 'report_user';
+select * from Information_schema.GLOBAL_VARIABLES where variable_name 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
 error ER_INCORRECT_GLOBAL_LOCAL_VAR;
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2008-03-06 20:33:26 +02:00
+++ b/sql/set_var.cc	2008-03-07 14:39:35 +02:00
@@ -648,6 +648,8 @@ sys_var_thd_time_zone            sys_tim
 
 /* Global read-only variable containing 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_user(&vars, "report_user",
&report_user);
 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 
 
 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", 
                                            &SV::keep_files_on_create);