bug#14798275 GLOBAL GTID VARIABLES RELEASED TO EARLY DURING SHUTDOWN

Libing Song · Libing Song · commit 2b39abccc76e · 2012-12-11T09:32:35.000+08:00
Problem: NDB engine encounters an error when embedded server shutdown,
if binlog is opened. It happens because binlog related things are closed
before NDB engine is closed, but the things(e.g GTID) may need when NDB
engine is closing.

Fix: Handler provides a hook ha_binlog_end which tells engines to finish
binlog related works before server closes binlog. But it was not compiled
in embedded server. In this patch it is compiled in embedded server, just
like a common mysql server.

No way to test the patch on mysql server without NDB. But there is a test
ndb_basic can verify this patch on ndb branches.
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -5245,7 +5245,6 @@ int ha_make_pushed_joins(THD *thd, const AQP::Join_plan* plan)
   DBUG_RETURN(args.err);
 }
 
-#ifdef HAVE_NDB_BINLOG
 /*
   TODO: change this into a dynamic struct
   List<handlerton> does not work as
@@ -5300,6 +5299,8 @@ static my_bool binlog_func_foreach(THD *thd, binlog_func_st *bfn)
   return FALSE;
 }
 
+#ifdef HAVE_NDB_BINLOG
+
 int ha_reset_logs(THD *thd)
 {
   binlog_func_st bfn= {BFN_RESET_LOGS, 0};
@@ -5319,13 +5320,6 @@ void ha_binlog_wait(THD* thd)
   binlog_func_foreach(thd, &bfn);
 }
 
-int ha_binlog_end(THD* thd)
-{
-  binlog_func_st bfn= {BFN_BINLOG_END, 0};
-  binlog_func_foreach(thd, &bfn);
-  return 0;
-}
-
 int ha_binlog_index_purge_file(THD *thd, const char *file)
 {
   binlog_func_st bfn= {BFN_BINLOG_PURGE_FILE, (void *)file};
@@ -5383,6 +5377,13 @@ void ha_binlog_log_query(THD *thd, handlerton *hton,
 }
 #endif
 
+int ha_binlog_end(THD* thd)
+{
+  binlog_func_st bfn= {BFN_BINLOG_END, 0};
+  binlog_func_foreach(thd, &bfn);
+  return 0;
+}
+
 /**
   Calculate cost of 'index only' scan for given index and number of records
 
diff --git a/sql/handler.h b/sql/handler.h
@@ -3413,16 +3413,17 @@ void ha_binlog_log_query(THD *thd, handlerton *db_type,
                          const char *query, uint query_length,
                          const char *db, const char *table_name);
 void ha_binlog_wait(THD *thd);
-int ha_binlog_end(THD *thd);
 #else
 #define ha_reset_logs(a) do {} while (0)
 #define ha_binlog_index_purge_file(a,b) do {} while (0)
 #define ha_reset_slave(a) do {} while (0)
 #define ha_binlog_log_query(a,b,c,d,e,f,g) do {} while (0)
 #define ha_binlog_wait(a) do {} while (0)
-#define ha_binlog_end(a)  do {} while (0)
 #endif
 
+/* It is required by basic binlog features on both MySQL server and libmysqld */
+int ha_binlog_end(THD *thd);
+
 const char *ha_legacy_type_name(legacy_db_type legacy_type);
 const char *get_canonical_filename(handler *file, const char *path,
                                    char *tmp_path);
