Bug#25807358: GET RID OF TMP_DISABLE_BINLOG/REENABLE_BINLOG MACROS

Post-post-push fix: Handle cases where
Rpl_info_table_access::create_thd() doesn't create a THD and
Rpl_info_table_access::drop_thd() doesn't delete a THD.

Author: jhauglid

sql/rpl_info_table.cc

@@ -122,6 +122,7 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance)
   THD *thd= access->create_thd();
 
   saved_mode= thd->variables.sql_mode;
+  ulonglong saved_options= thd->variables.option_bits;
   thd->variables.option_bits &= ~OPTION_BIN_LOG;
 
   /*
@@ -171,6 +172,7 @@ int Rpl_info_table::do_init_info(enum_find_method method, uint instance)
   */
   access->close_table(thd, table, &backup, error);
   thd->variables.sql_mode= saved_mode;
+  thd->variables.option_bits= saved_options;
   access->drop_thd(thd);
   DBUG_RETURN(error);
 }
@@ -193,6 +195,7 @@ int Rpl_info_table::do_flush_info(const bool force)
 
   sync_counter= 0;
   saved_mode= thd->variables.sql_mode;
+  ulonglong saved_options= thd->variables.option_bits;
   thd->variables.option_bits &= ~OPTION_BIN_LOG;
   thd->is_operating_substatement_implicitly= true;
 
@@ -281,6 +284,7 @@ int Rpl_info_table::do_flush_info(const bool force)
   access->close_table(thd, table, &backup, error);
   thd->is_operating_substatement_implicitly= false;
   thd->variables.sql_mode= saved_mode;
+  thd->variables.option_bits= saved_options;
   access->drop_thd(thd);
   DBUG_RETURN(error);
 }
@@ -303,6 +307,7 @@ int Rpl_info_table::do_clean_info()
   THD *thd= access->create_thd();
 
   saved_mode= thd->variables.sql_mode;
+  ulonglong saved_options= thd->variables.option_bits;
   thd->variables.option_bits &= ~OPTION_BIN_LOG;
 
   /*
@@ -335,6 +340,7 @@ int Rpl_info_table::do_clean_info()
   */
   access->close_table(thd, table, &backup, error);
   thd->variables.sql_mode= saved_mode;
+  thd->variables.option_bits= saved_options;
   access->drop_thd(thd);
   DBUG_RETURN(error);
 }
@@ -371,6 +377,7 @@ int Rpl_info_table::do_reset_info(uint nparam,
 
   thd= info->access->create_thd();
   saved_mode= thd->variables.sql_mode;
+  ulonglong saved_options= thd->variables.option_bits;
   thd->variables.option_bits &= ~OPTION_BIN_LOG;
 
   /*
@@ -445,6 +452,7 @@ int Rpl_info_table::do_reset_info(uint nparam,
   */
   info->access->close_table(thd, table, &backup, error);
   thd->variables.sql_mode= saved_mode;
+  thd->variables.option_bits= saved_options;
   info->access->drop_thd(thd);
   delete info;
   DBUG_RETURN(error);
@@ -797,6 +805,7 @@ bool Rpl_info_table::do_update_is_transactional()
 
   THD *thd= access->create_thd();
   saved_mode= thd->variables.sql_mode;
+  ulonglong saved_options= thd->variables.option_bits;
   thd->variables.option_bits &= ~OPTION_BIN_LOG;
 
   /*
@@ -813,6 +822,7 @@ bool Rpl_info_table::do_update_is_transactional()
 end:
   access->close_table(thd, table, &backup, 0);
   thd->variables.sql_mode= saved_mode;
+  thd->variables.option_bits= saved_options;
   access->drop_thd(thd);
   DBUG_RETURN(error);
 }