MDEV-4650: show variables; ERROR 1946 (HY000): Failed to load replication slave GTID position
The last commit was too quick, the changes to gtid_current_pos were just wrong. So remove them.
This commit is contained in:
parent
b978a14c6e
commit
378bd0442a
@ -1310,17 +1310,7 @@ Sys_var_gtid_current_pos::global_value_ptr(THD *thd, LEX_STRING *base)
|
|||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
str.length(0);
|
str.length(0);
|
||||||
|
if (rpl_append_gtid_state(&str, true) ||
|
||||||
/*
|
|
||||||
If the mysql.rpl_slave_pos table could not be loaded, then we cannot
|
|
||||||
easily automatically try to reload it here - we may be inside a statement
|
|
||||||
that already has tables locked and so opening more tables is problematic.
|
|
||||||
|
|
||||||
But if the table is not loaded (eg. missing mysql_upgrade_db or some such),
|
|
||||||
then the slave state must be empty anyway.
|
|
||||||
*/
|
|
||||||
if ((rpl_global_gtid_slave_state.loaded &&
|
|
||||||
rpl_append_gtid_state(&str, true)) ||
|
|
||||||
!(p= thd->strmake(str.ptr(), str.length())))
|
!(p= thd->strmake(str.ptr(), str.length())))
|
||||||
{
|
{
|
||||||
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user