[Commits] Rev 3687: MDEV-4650: show variables; ERROR 1946 (HY000): Failed to load replication slave GTID position in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Aug 26 14:26:21 EEST 2013


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 3687
revision-id: knielsen at knielsen-hq.org-20130826112621-cxjy0gk72w2ccyxb
parent: knielsen at knielsen-hq.org-20130826105109-fuzmdpnn6k93nf0k
committer: knielsen at knielsen-hq.org
branch nick: work-10.0-mdev26
timestamp: Mon 2013-08-26 13:26:21 +0200
message:
  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.
=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2013-08-26 10:51:09 +0000
+++ b/sql/sys_vars.cc	2013-08-26 11:26:21 +0000
@@ -1310,17 +1310,7 @@ Sys_var_gtid_current_pos::global_value_p
   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));



More information about the commits mailing list