Bug#27041759 RESET MASTER WHILE A TRX IN BGC(AFTER FLUSH)

Venkatesh Duggirala · Venkatesh Duggirala · commit 0dacffc6059d · 2018-03-12T17:38:13.000+05:30
LEAVING SERVER IN BAD GTID STATE

Postpush fix: Fixing GR test script failure. Unlocking
of global read lock is not happening in an error case.
diff --git a/sql/rpl_master.cc b/sql/rpl_master.cc
@@ -885,7 +885,7 @@ bool reset_master(THD *thd, bool unlock_global_read_lock) {
   thd->set_skip_readonly_check();
   if (is_group_replication_running()) {
     my_error(ER_CANT_RESET_MASTER, MYF(0), "Group Replication is running");
-    return true;
+    goto end;
   }
 
   if (mysql_bin_log.is_open()) {
@@ -907,6 +907,7 @@ bool reset_master(THD *thd, bool unlock_global_read_lock) {
     global_sid_lock->unlock();
   }
 
+end:
   /*
     Unlock the global read lock (which was aquired by this
     session as part of RESET MASTER) before running the hook

Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ bool reset_master(THD *thd, bool unlock_global_read_lock) {`
`885`	`885`	`thd->set_skip_readonly_check();`
`886`	`886`	`if (is_group_replication_running()) {`
`887`	`887`	`my_error(ER_CANT_RESET_MASTER, MYF(0), "Group Replication is running");`
`888`		`- return true;`
	`888`	`+ goto end;`
`889`	`889`	`}`
`890`	`890`
`891`	`891`	`if (mysql_bin_log.is_open()) {`
`@@ -907,6 +907,7 @@ bool reset_master(THD *thd, bool unlock_global_read_lock) {`
`907`	`907`	`global_sid_lock->unlock();`
`908`	`908`	`}`
`909`	`909`
	`910`	`+end:`
`910`	`911`	`/*`
`911`	`912`	`Unlock the global read lock (which was aquired by this`
`912`	`913`	`session as part of RESET MASTER) before running the hook`