Fix for BUG#791:

a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.

sql/handler.cc

@@ -346,7 +346,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
     bool transaction_commited= 0;
 
     /* Update the binary log if we have cached some queries */
-    if (trans == &thd->transaction.all && mysql_bin_log.is_open() &&
+    if (trans == &thd->transaction.all && mysql_bin_log.is_open(1) &&
 	my_b_tell(&thd->transaction.trans_log))
     {
       mysql_bin_log.write(thd, &thd->transaction.trans_log);
@@ -385,7 +385,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
     if (transaction_commited && thd->transaction.changed_tables)
       query_cache.invalidate(thd->transaction.changed_tables);
 #endif /*HAVE_QUERY_CACHE*/
-    if (error && trans == &thd->transaction.all && mysql_bin_log.is_open())
+    if (error && trans == &thd->transaction.all && mysql_bin_log.is_open(1))
       sql_print_error("Error: Got error during commit;  Binlog is not up to date!");
     thd->variables.tx_isolation=thd->session_tx_isolation;
     if (operation_done)

sql/item_func.cc

@@ -1504,7 +1504,7 @@ void item_user_lock_free(void)
 void item_user_lock_release(ULL *ull)
 {
   ull->locked=0;
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     char buf[256];
     String tmp(buf,sizeof(buf));

sql/log_event.cc

@@ -2167,7 +2167,7 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli)
 
 int Slave_log_event::exec_event(struct st_relay_log_info* rli)
 {
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
     mysql_bin_log.write(this);
   return Log_event::exec_event(rli);
 }
@@ -2217,7 +2217,7 @@ int Create_file_log_event::exec_event(struct st_relay_log_info* rli)
     slave_print_error(rli,my_errno, "Write to '%s' failed", fname_buf);
     goto err;
   }
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
     mysql_bin_log.write(this);
   error=0;					// Everything is ok
 
@@ -2237,7 +2237,7 @@ int Delete_file_log_event::exec_event(struct st_relay_log_info* rli)
   (void) my_delete(fname, MYF(MY_WME));
   memcpy(p, ".info", 6);
   (void) my_delete(fname, MYF(MY_WME));
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
     mysql_bin_log.write(this);
   return Log_event::exec_event(rli);
 }
@@ -2260,7 +2260,7 @@ int Append_block_log_event::exec_event(struct st_relay_log_info* rli)
     slave_print_error(rli,my_errno, "Write to '%s' failed", fname);
     goto err;
   }
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
     mysql_bin_log.write(this);
   error=0;
 
@@ -2319,7 +2319,7 @@ int Execute_load_log_event::exec_event(struct st_relay_log_info* rli)
   (void) my_delete(fname, MYF(MY_WME));
   memcpy(p, ".data", 6);
   (void) my_delete(fname, MYF(MY_WME));
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
     mysql_bin_log.write(this);
   error = 0;
 

sql/mysqld.cc

@@ -1972,6 +1972,8 @@ bool open_log(MYSQL_LOG *log, const char *hostname,
       strmake(tmp,opt_name,min(length,FN_REFLEN));
       opt_name=tmp;
     }
+    if (*fn_ext(opt_name))
+      log->set_no_rotate(1);
   }
   return log->open(opt_name, type, 0, index_file_name,
 		   (read_append) ? SEQ_READ_APPEND : WRITE_CACHE,
@@ -2019,6 +2021,17 @@ int main(int argc, char **argv)
   }
 #endif
 
+  /*
+    Init mutexes for the global MYSQL_LOG objects.
+    As safe_mutex depends on what MY_INIT() does, we can't init the mutexes of
+    global MYSQL_LOGs in their constructors, because then they would be inited
+    before MY_INIT(). So we do it here.
+  */
+  mysql_log.init_pthread_objects();
+  mysql_update_log.init_pthread_objects();
+  mysql_slow_log.init_pthread_objects();
+  mysql_bin_log.init_pthread_objects();
+  
   if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0)
     strmov(glob_hostname,"mysql");
   strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);

sql/repl_failsafe.cc

@@ -265,7 +265,7 @@ int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg)
   LINT_INIT(cmp_res);
   DBUG_ENTER("translate_master");
 
-  if (!mysql_bin_log.is_open())
+  if (!mysql_bin_log.is_open(1))
   {
     strmov(errmsg,"Binary log is not open");
     DBUG_RETURN(1);

sql/slave.cc

@@ -1736,6 +1736,7 @@ st_relay_log_info::st_relay_log_info()
   pthread_cond_init(&start_cond, NULL);
   pthread_cond_init(&stop_cond, NULL);
   pthread_cond_init(&log_space_cond, NULL);
+  relay_log.init_pthread_objects();
 }
 
 
@@ -3443,14 +3444,18 @@ void rotate_relay_log(MASTER_INFO* mi)
 {
   DBUG_ENTER("rotate_relay_log");
   RELAY_LOG_INFO* rli= &mi->rli;
-  /* If this server is not a slave (or RESET SLAVE has just been run) */
+
+  lock_slave_threads(mi);
+  pthread_mutex_lock(&rli->data_lock);
+  /* 
+     We need to test inited because otherwise, new_file() will attempt to lock
+     LOCK_log, which may not be inited (if we're not a slave).
+  */
   if (!rli->inited)
   {
     DBUG_PRINT("info", ("rli->inited == 0"));
-    DBUG_VOID_RETURN;
+    goto end;
   }
-  lock_slave_threads(mi);
-  pthread_mutex_lock(&rli->data_lock);
 
   /* If the relay log is closed, new_file() will do nothing. */
   rli->relay_log.new_file(1);
@@ -3469,6 +3474,7 @@ void rotate_relay_log(MASTER_INFO* mi)
     0 as they probably have been harvested.
   */
   rli->relay_log.harvest_bytes_written(&rli->log_space_total);
+end:
   pthread_mutex_unlock(&rli->data_lock);
   unlock_slave_threads(mi);
   DBUG_VOID_RETURN;

sql/sql_base.cc

@@ -574,7 +574,7 @@ void close_temporary_tables(THD *thd)
     next=table->next;
     close_temporary(table);
   }
-  if (query && found_user_tables && mysql_bin_log.is_open())
+  if (query && found_user_tables && mysql_bin_log.is_open(1))
   {
     /* The -1 is to remove last ',' */
     Query_log_event qinfo(thd, query, (ulong)(end-query)-1, 0);

sql/sql_class.h

@@ -61,6 +61,11 @@ class Log_event;
 
 class MYSQL_LOG {
  private:
+  /* 
+     LOCK_log is inited by MYSQL_LOG::init(), so one should try to lock it only
+     if he is sure MYSQL_LOG::init() has been called (i.e. if 'inited' is true).
+     Same for LOCK_index.
+  */
   pthread_mutex_t LOCK_log, LOCK_index;
   pthread_cond_t update_cond;
   ulonglong bytes_written;
@@ -80,7 +85,7 @@ class MYSQL_LOG {
   */
   volatile enum_log_type log_type;
   enum cache_type io_cache_type;
-  bool write_error,inited;
+  bool write_error;
   bool no_rotate;
   bool need_start_event;
   bool no_auto_events; // for relay binlog
@@ -123,6 +128,7 @@ class MYSQL_LOG {
   void init(enum_log_type log_type_arg,
 	    enum cache_type io_cache_type_arg,
 	    bool no_auto_events_arg, ulong max_size);
+  void init_pthread_objects();
   void cleanup();
   bool open(const char *log_name,enum_log_type log_type,
 	    const char *new_name, const char *index_file_name_arg,
@@ -158,8 +164,8 @@ class MYSQL_LOG {
   int find_next_log(LOG_INFO* linfo, bool need_mutex);
   int get_current_log(LOG_INFO* linfo);
   uint next_file_id();
+  bool is_open(bool need_mutex=0);
 
-  inline bool is_open() { return log_type != LOG_CLOSED; }
   inline char* get_index_fname() { return index_file_name;}
   inline char* get_log_fname() { return log_file_name; }
   inline pthread_mutex_t* get_log_lock() { return &LOCK_log; }
@@ -169,6 +175,7 @@ class MYSQL_LOG {
   inline void unlock_index() { pthread_mutex_unlock(&LOCK_index);}
   inline IO_CACHE *get_index_file() { return &index_file;}
   inline uint32 get_open_count() { return open_count; }
+  inline void set_no_rotate(bool no_rotate_arg) {no_rotate= no_rotate_arg;}
 };
 
 /* character conversion tables */

sql/sql_db.cc

@@ -84,7 +84,7 @@ int mysql_create_db(THD *thd, char *db, uint create_options, bool silent)
     }
     {
       mysql_update_log.write(thd,thd->query, thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
 	mysql_bin_log.write(&qinfo);
@@ -174,7 +174,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
 	thd->query= path;
       }
       mysql_update_log.write(thd, thd->query, thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
 	mysql_bin_log.write(&qinfo);

sql/sql_delete.cc

@@ -172,7 +172,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
   if (deleted && (error <= 0 || !transactional_table))
   {
     mysql_update_log.write(thd,thd->query, thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length, 
 			    log_delayed);
@@ -476,7 +476,7 @@ bool multi_delete::send_eof()
   if (deleted && (error <= 0 || normal_tables))
   {
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
 			    log_delayed);
@@ -588,7 +588,7 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
     if (!error)
     {
       mysql_update_log.write(thd,thd->query,thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length,
 			      thd->tmp_table);

sql/sql_insert.cc

@@ -308,7 +308,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
     if ((info.copied || info.deleted) && (error <= 0 || !transactional_table))
     {
       mysql_update_log.write(thd, thd->query, thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length,
 			      log_delayed);
@@ -1143,7 +1143,7 @@ bool delayed_insert::handle_inserts(void)
 {
   int error;
   uint max_rows;
-  bool using_ignore=0, using_bin_log=mysql_bin_log.is_open();
+  bool using_ignore=0, using_bin_log=mysql_bin_log.is_open(1);
   delayed_row *row;
   DBUG_ENTER("handle_inserts");
 
@@ -1361,7 +1361,7 @@ void select_insert::send_error(uint errcode,const char *err)
     if (last_insert_id)
       thd->insert_id(last_insert_id);		// For binary log
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
                             table->file->has_transactions());
@@ -1387,7 +1387,7 @@ bool select_insert::send_eof()
     thd->insert_id(last_insert_id);		// For binary log
   /* Write to binlog before commiting transaction */
   mysql_update_log.write(thd,thd->query,thd->query_length);
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     Query_log_event qinfo(thd, thd->query, thd->query_length,
 			  table->file->has_transactions());

sql/sql_load.cc

@@ -219,7 +219,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
     DBUG_RETURN(-1);				// Can't allocate buffers
   }
 
-  if (!opt_old_rpl_compat && mysql_bin_log.is_open())
+  if (!opt_old_rpl_compat && mysql_bin_log.is_open(1))
   {
     lf_info.thd = thd;
     lf_info.ex = ex;
@@ -281,7 +281,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   {
     if (transactional_table)
       ha_autocommit_or_rollback(thd,error);
-    if (!opt_old_rpl_compat && mysql_bin_log.is_open())
+    if (!opt_old_rpl_compat && mysql_bin_log.is_open(1))
     {
       if (lf_info.wrote_create_file)
       {
@@ -315,7 +315,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
 
   if (!log_delayed)
     thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     if (opt_old_rpl_compat)
     {
@@ -607,7 +607,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, String &field_term,
 	cache.read_function = _my_b_net_read;
 
       need_end_io_cache = 1;
-      if (!opt_old_rpl_compat && mysql_bin_log.is_open())
+      if (!opt_old_rpl_compat && mysql_bin_log.is_open(1))
 	cache.pre_read = cache.pre_close =
 	  (IO_CACHE_CALLBACK) log_loaded_block;
     }

sql/sql_parse.cc

@@ -2432,7 +2432,7 @@ mysql_execute_command(void)
 				    lex->sql_command == SQLCOM_REVOKE)))
       {
 	mysql_update_log.write(thd, thd->query, thd->query_length);
-	if (mysql_bin_log.is_open())
+	if (mysql_bin_log.is_open(1))
 	{
 	  Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
 	  mysql_bin_log.write(&qinfo);
@@ -2452,7 +2452,7 @@ mysql_execute_command(void)
       if (!res)
       {
 	mysql_update_log.write(thd, thd->query, thd->query_length);
-	if (mysql_bin_log.is_open())
+	if (mysql_bin_log.is_open(1))
 	{
 	  Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
 	  mysql_bin_log.write(&qinfo);

sql/sql_rename.cc

@@ -80,7 +80,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list)
   if (!error)
   {
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
       mysql_bin_log.write(&qinfo);

sql/sql_repl.cc

@@ -269,7 +269,7 @@ int purge_master_logs(THD* thd, const char* to_log)
   const char* errmsg = 0;
   int res;
 
-  if (!mysql_bin_log.is_open())
+  if (!mysql_bin_log.is_open(1))
     goto end;
 
   mysql_bin_log.make_log_name(search_file_name, to_log);
@@ -335,7 +335,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
   }
 #endif
 
-  if (!mysql_bin_log.is_open())
+  if (!mysql_bin_log.is_open(1))
   {
     errmsg = "Binary log is not open";
     my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
@@ -972,7 +972,7 @@ int change_master(THD* thd, MASTER_INFO* mi)
 
 int reset_master(THD* thd)
 {
-  if (!mysql_bin_log.is_open())
+  if (!mysql_bin_log.is_open(1))
   {
     my_error(ER_FLUSH_MASTER_BINLOG_CLOSED,  MYF(ME_BELL+ME_WAITTANG));
     return 1;
@@ -1010,7 +1010,7 @@ int show_binlog_events(THD* thd)
   if (send_fields(thd, field_list, 1))
     DBUG_RETURN(-1);
 
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     LEX_MASTER_INFO *lex_mi = &thd->lex.mi;
     ha_rows event_count, limit_start, limit_end;
@@ -1110,7 +1110,7 @@ int show_binlog_info(THD* thd)
   String* packet = &thd->packet;
   packet->length(0);
 
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     LOG_INFO li;
     mysql_bin_log.get_current_log(&li);
@@ -1128,7 +1128,7 @@ int show_binlog_info(THD* thd)
 
 
 /*
-  Send a lost of all binary logs to client
+  Send a list of all binary logs to client
 
   SYNOPSIS
     show_binlogs()
@@ -1148,7 +1148,7 @@ int show_binlogs(THD* thd)
   String *packet = &thd->packet;
   uint length;
 
-  if (!mysql_bin_log.is_open())
+  if (!mysql_bin_log.is_open(1))
   {
     //TODO:  Replace with ER() error message
     send_error(net, 0, "You are not using binary logging");

sql/sql_table.cc

@@ -235,7 +235,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
     if (!dont_log_query)
     {
       mysql_update_log.write(thd, thd->query,thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length,
 			      tmp_table_deleted && !some_tables_deleted);
@@ -766,7 +766,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
   {
     // Must be written before unlock
     mysql_update_log.write(thd,thd->query, thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
 			    test(create_info->options &
@@ -1548,7 +1548,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     if (!error)
     {
       mysql_update_log.write(thd, thd->query, thd->query_length);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open(1))
       {
 	Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
 	mysql_bin_log.write(&qinfo);
@@ -1918,7 +1918,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
       goto err;
     }
     mysql_update_log.write(thd, thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
       mysql_bin_log.write(&qinfo);
@@ -2050,7 +2050,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
   }
   thd->proc_info="end";
   mysql_update_log.write(thd, thd->query,thd->query_length);
-  if (mysql_bin_log.is_open())
+  if (mysql_bin_log.is_open(1))
   {
     Query_log_event qinfo(thd, thd->query, thd->query_length, 0);
     mysql_bin_log.write(&qinfo);

sql/sql_update.cc

@@ -317,7 +317,7 @@ int mysql_update(THD *thd,
   if (updated && (error <= 0 || !transactional_table))
   {
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
 			    log_delayed);
@@ -933,7 +933,7 @@ bool multi_update::send_eof()
   if (updated && (local_error <= 0 || !trans_safe))
   {
     mysql_update_log.write(thd,thd->query,thd->query_length);
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open(1))
     {
       Query_log_event qinfo(thd, thd->query, thd->query_length,
 			    log_delayed);