Fixed issues found by QA (Elena)

- Added parameter to reset_logs() so that one can specify if new logs should be created.

mysql-test/include/setup_fake_relay_log.inc:
  There is no orphan relay log files anymore
mysql-test/mysql-test-run.pl:
  Added multi_source to test suite
mysql-test/suite/multi_source/info_logs.result:
  New test
mysql-test/suite/multi_source/info_logs.test:
  New test
mysql-test/suite/multi_source/my.cnf:
  Added log-warnings to get more information to the log files
mysql-test/suite/multi_source/relaylog_events.result:
  Added cleanup
mysql-test/suite/multi_source/relaylog_events.test:
  Added cleanup
mysql-test/suite/multi_source/reset_slave.result:
  Updated results after improved RESET SLAVE
mysql-test/suite/multi_source/simple.result:
  Updated results after improved RESET SLAVE
mysql-test/suite/multi_source/simple.test:
  Syncronize positions before show full slave status
mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result:
  Updated results after improved RESET SLAVE (we now use less relay log files)
mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result:
  Updated results after improved RESET SLAVE (we now use less relay log files)
sql/log.cc:
  Added parameter to reset_logs() so that one can specify if new logs should be created.
sql/log.h:
  Added parameter to reset_logs()
sql/rpl_mi.cc:
  Create Master_info_index::index_file_names once at init
  More DBUG_PRINT
  Give error if Master_info_index::check_duplicate_master_info fails
sql/rpl_rli.cc:
  If we do a full reset, don't create any new relay log files.
sql/share/errmsg-utf8.txt:
  Improved error message if connection exists
sql/sql_parse.cc:
  Fixed memory leak
sql/sql_repl.cc:
  check_duplicate_master_info() now generates an error
  Added parameter to reset_logs()

7 files changed, 58 insertions, 51 deletions

diff --git a/sql/log.cc b/sql/log.cc
index 54340f94679..1f3c529f491 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3598,11 +3598,11 @@ err:
 
 /**
   Delete all logs refered to in the index file.
-  Start writing to a new log file.
 
   The new index file will only contain this file.
 
-  @param thd		Thread
+  @param thd		  Thread
+  @param create_new_log  1 if we should start writing to a new log file
 
   @note
     If not called from slave thread, write start event to new log
@@ -3613,7 +3613,7 @@ err:
     1   error
 */
 
-bool MYSQL_BIN_LOG::reset_logs(THD* thd)
+bool MYSQL_BIN_LOG::reset_logs(THD* thd, bool create_new_log)
 {
   LOG_INFO linfo;
   bool error=0;
@@ -3780,7 +3780,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
       goto err;
     }
   }
-  if (!open_index_file(index_file_name, 0, FALSE))
+  if (create_new_log && !open_index_file(index_file_name, 0, FALSE))
     if ((error= open(save_name, log_type, 0, io_cache_type, max_size, 0, FALSE)))
       goto err;
   my_free((void *) save_name);
diff --git a/sql/log.h b/sql/log.h
index cd1845908ef..0ade3618fd7 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -748,7 +748,7 @@ public:
   int register_create_index_entry(const char* entry);
   int purge_index_entry(THD *thd, ulonglong *decrease_log_space,
                         bool need_mutex);
-  bool reset_logs(THD* thd);
+  bool reset_logs(THD* thd, bool create_new_log);
   void close(uint exiting);
   void clear_inuse_flag_when_closing(File file);
 
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index 3dc3e38f419..366b271851a 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -657,7 +657,20 @@ void create_signed_file_name(char *res_file_name, uint length,
 
 Master_info_index::Master_info_index()
 {
-  index_file_name[0] = 0;
+  size_t filename_length, dir_length;
+  /*
+    Create the Master_info index file by prepending 'multi-' before
+    the master_info_file file name.
+  */
+  fn_format(index_file_name, master_info_file, mysql_data_home,
+            "", MY_UNPACK_FILENAME);
+  filename_length= strlen(index_file_name) + 1; /* Count 0 byte */
+  dir_length= dirname_length(index_file_name);
+  bmove_upp((uchar*) index_file_name + filename_length + 6,
+            (uchar*) index_file_name + filename_length,
+            filename_length - dir_length);
+  memcpy(index_file_name + dir_length, "multi-", 6);
+
   bzero((char*) &index_file, sizeof(index_file));
 }
 
@@ -684,22 +697,8 @@ bool Master_info_index::init_all_master_info()
   int err_num= 0, succ_num= 0; // The number of success read Master_info
   char sign[MAX_CONNECTION_NAME];
   File index_file_nr;
-  size_t filename_length, dir_length;
   DBUG_ENTER("init_all_master_info");
 
-  /*
-    Create the Master_info index file by prepending 'multi-' before
-    the master_info_file file name.
-  */
-  fn_format(index_file_name, master_info_file, mysql_data_home,
-            "", MY_UNPACK_FILENAME);
-  filename_length= strlen(index_file_name) + 1; /* Count 0 byte */
-  dir_length= dirname_length(index_file_name);
-  bmove_upp((uchar*) index_file_name + filename_length + 6,
-            (uchar*) index_file_name + filename_length,
-            filename_length - dir_length);
-  memcpy(index_file_name + dir_length, "multi-", 6);
-
   if ((index_file_nr= my_open(index_file_name,
                               O_RDWR | O_CREAT | O_BINARY ,
                               MYF(MY_WME | ME_NOREFRESH))) < 0 ||
@@ -891,6 +890,10 @@ Master_info_index::get_master_info(LEX_STRING *connection_name,
   Master_info *mi;
   char buff[MAX_CONNECTION_NAME+1], *res;
   uint buff_length;
+  DBUG_ENTER("get_master_info");
+  DBUG_PRINT("enter",
+             ("connection_name: '%.*s'", (int) connection_name->length,
+              connection_name->str));
 
   /* Make name lower case for comparison */
   res= strmake(buff, connection_name->str, connection_name->length);
@@ -907,7 +910,7 @@ Master_info_index::get_master_info(LEX_STRING *connection_name,
              (int) connection_name->length,
              connection_name->str);
   }
-  return mi;
+  DBUG_RETURN(mi);
 }
 
 
@@ -917,6 +920,7 @@ bool Master_info_index::check_duplicate_master_info(LEX_STRING *name_arg,
                                                     uint port)
 {
   Master_info *mi;
+  DBUG_ENTER("check_duplicate_master_info");
 
   /* Get full host and port name */
   if ((mi= master_info_index->get_master_info(name_arg,
@@ -928,7 +932,7 @@ bool Master_info_index::check_duplicate_master_info(LEX_STRING *name_arg,
       port= mi->port;
   }
   if (!host || !port)
-    return FALSE;                               // Not comparable yet
+    DBUG_RETURN(FALSE);                         // Not comparable yet
 
   for (uint i= 0; i < master_info_hash.records; ++i)
   {
@@ -938,13 +942,15 @@ bool Master_info_index::check_duplicate_master_info(LEX_STRING *name_arg,
       continue;                                 // Current connection
     if (!strcasecmp(host, tmp_mi->host) && port == tmp_mi->port)
     {
-      sql_print_error(ER(ER_CONNECTION_ALREADY_EXISTS),
-                      (int) tmp_mi->connection_name.length,
-                      tmp_mi->connection_name.str);
-      return TRUE;
+      my_error(ER_CONNECTION_ALREADY_EXISTS, MYF(0),
+               (int) name_arg->length,
+               name_arg->str,
+               (int) tmp_mi->connection_name.length,
+               tmp_mi->connection_name.str);
+      DBUG_RETURN(TRUE);
     }
   }
-  return FALSE;
+  DBUG_RETURN(FALSE);
 }
 
 
@@ -994,9 +1000,6 @@ bool Master_info_index::remove_master_info(LEX_STRING *name)
       my_close(index_file.file, MYF(MY_WME));
 
       // Reopen File and truncate it
-      fn_format(index_file_name, master_info_file, mysql_data_home,
-                ".index", MY_UNPACK_FILENAME | MY_APPEND_EXT);
-
       if ((index_file_nr= my_open(index_file_name,
                                   O_RDWR | O_CREAT | O_TRUNC | O_BINARY ,
                                   MYF(MY_WME))) < 0 ||
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 442a9895f6b..49c8390ff9b 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1015,28 +1015,37 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset,
     rli->cur_log_fd= -1;
   }
 
-  if (rli->relay_log.reset_logs(thd))
+  if (rli->relay_log.reset_logs(thd, !just_reset))
   {
     *errmsg = "Failed during log reset";
     error=1;
     goto err;
   }
-  /* Save name of used relay log file */
-  strmake(rli->group_relay_log_name, rli->relay_log.get_log_fname(),
-          sizeof(rli->group_relay_log_name)-1);
-  strmake(rli->event_relay_log_name, rli->relay_log.get_log_fname(),
-          sizeof(rli->event_relay_log_name)-1);
-  rli->group_relay_log_pos= rli->event_relay_log_pos= BIN_LOG_HEADER_SIZE;
-  if (count_relay_log_space(rli))
-  {
-    *errmsg= "Error counting relay log space";
-    error=1;
-    goto err;
-  }
   if (!just_reset)
+  {
+    /* Save name of used relay log file */
+    strmake(rli->group_relay_log_name, rli->relay_log.get_log_fname(),
+            sizeof(rli->group_relay_log_name)-1);
+    strmake(rli->event_relay_log_name, rli->relay_log.get_log_fname(),
+            sizeof(rli->event_relay_log_name)-1);
+    rli->group_relay_log_pos= rli->event_relay_log_pos= BIN_LOG_HEADER_SIZE;
+    rli->log_space_total= 0;
+
+    if (count_relay_log_space(rli))
+    {
+      *errmsg= "Error counting relay log space";
+      error=1;
+      goto err;
+    }
     error= init_relay_log_pos(rli, rli->group_relay_log_name,
                               rli->group_relay_log_pos,
                               0 /* do not need data lock */, errmsg, 0);
+  }
+  else
+  {
+    /* Ensure relay log names are not used */
+    rli->group_relay_log_name[0]= rli->event_relay_log_name[0]= 0;
+  }
 
 err:
 #ifndef DBUG_OFF
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index bb5506756e1..803575b7ba0 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6589,7 +6589,6 @@ ER_NO_SUCH_TABLE_IN_ENGINE 42S02
         eng "Table '%-.192s.%-.192s' doesn't exist in engine"
         swe "Det finns ingen tabell som heter '%-.192s.%-.192s' i handlern"
 ER_CONNECTION_ALREADY_EXISTS
-        eng "Connection '%.*s' already exists"
+        eng "Connection '%.*s' conflicts with existing connection '%.*s'"
 ER_MASTER_LOG_PREFIX
         eng "Master '%.*s': "
-
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 114035bc16d..831931e1ef2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2377,6 +2377,7 @@ case SQLCOM_PREPARE:
         work.
       */
       master_info_index->remove_master_info(&lex_mi->connection_name);
+      delete mi;
     }
 
     mysql_mutex_unlock(&LOCK_active_mi);
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 036afb45a19..ed00fcaaddf 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1682,12 +1682,7 @@ bool change_master(THD* thd, Master_info* mi)
   if (master_info_index->check_duplicate_master_info(&lex_mi->connection_name,
                                                      lex_mi->host,
                                                      lex_mi->port))
-  {
-    my_error(ER_MASTER_INFO, MYF(0),
-             (int) lex_mi->connection_name.length,
-             lex_mi->connection_name.str);
     DBUG_RETURN(TRUE);
-  }
 
   lock_slave_threads(mi);
   init_thread_mask(&thread_mask,mi,0 /*not inverse*/);
@@ -1996,7 +1991,7 @@ int reset_master(THD* thd)
     return 1;
   }
 
-  if (mysql_bin_log.reset_logs(thd))
+  if (mysql_bin_log.reset_logs(thd, 1))
     return 1;
   RUN_HOOK(binlog_transmit, after_reset_master, (thd, 0 /* flags */));
   return 0;