From 378bd0442a62d1067d19c67dddc3d8b27fc8a537 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 26 Aug 2013 13:26:21 +0200 Subject: [PATCH] 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. --- sql/sys_vars.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 3dc6ba88293..842cb111d30 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1310,17 +1310,7 @@ Sys_var_gtid_current_pos::global_value_ptr(THD *thd, LEX_STRING *base) char *p; str.length(0); - - /* - 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)) || + if (rpl_append_gtid_state(&str, true) || !(p= thd->strmake(str.ptr(), str.length()))) { my_error(ER_OUT_OF_RESOURCES, MYF(0));