Commit 5dd28db2 authored by Sergei Golubchik's avatar Sergei Golubchik

don't error out in Sys_var::global_value_ptr(),

it's not nice when unconfigured gtid prevents SHOW VARIABLES from working
parent 9747fbb4
...@@ -1449,11 +1449,8 @@ Sys_var_gtid_binlog_pos::global_value_ptr(THD *thd, LEX_STRING *base) ...@@ -1449,11 +1449,8 @@ Sys_var_gtid_binlog_pos::global_value_ptr(THD *thd, LEX_STRING *base)
char *p; char *p;
if (!rpl_global_gtid_slave_state.loaded) if (!rpl_global_gtid_slave_state.loaded)
{
my_error(ER_CANNOT_LOAD_SLAVE_GTID_STATE, MYF(0), "mysql",
rpl_gtid_slave_state_table_name.str);
return NULL; return NULL;
}
str.length(0); str.length(0);
if ((opt_bin_log && mysql_bin_log.append_state_pos(&str)) || if ((opt_bin_log && mysql_bin_log.append_state_pos(&str)) ||
!(p= thd->strmake(str.ptr(), str.length()))) !(p= thd->strmake(str.ptr(), str.length())))
...@@ -1567,11 +1564,7 @@ Sys_var_gtid_slave_pos::global_value_ptr(THD *thd, LEX_STRING *base) ...@@ -1567,11 +1564,7 @@ Sys_var_gtid_slave_pos::global_value_ptr(THD *thd, LEX_STRING *base)
char *p; char *p;
if (!rpl_global_gtid_slave_state.loaded) if (!rpl_global_gtid_slave_state.loaded)
{
my_error(ER_CANNOT_LOAD_SLAVE_GTID_STATE, MYF(0), "mysql",
rpl_gtid_slave_state_table_name.str);
return NULL; return NULL;
}
str.length(0); str.length(0);
if (rpl_append_gtid_state(&str, false) || if (rpl_append_gtid_state(&str, false) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment