diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-07 14:39:37 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-07 14:39:37 +0200 |
| commit | f613588c2bc6b1d1f735eb97eb58231a9c7d2f7f (patch) | |
| tree | bae193fa5fbfd1650fef93201206d873ff103276 /sql/set_var.cc | |
| parent | 43f15ec126f29ef61fd3f11138d5427a76b2a8c6 (diff) | |
| download | mariadb-git-f613588c2bc6b1d1f735eb97eb58231a9c7d2f7f.tar.gz | |
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:
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
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d80ae577a0d..71131df0ce3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -648,6 +648,8 @@ sys_var_thd_time_zone sys_time_zone(&vars, "time_zone"); /* 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 *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); |