bzr push into mysql-trunk branch (luis.soares:3427 to 3428)

[Luis Soares]

 3428 Luis Soares	2011-11-09 [merge]
      merge from mysql-trunk-wl4143.

    modified:
      sql/rpl_slave.cc
 3427 Alfranio Correia	2011-11-09 [merge]
      merge mysql-trunk-wl4143 --> mysql-trunk-stage

    modified:
      mysql-test/r/rewrite_general_log.result
      mysql-test/t/rewrite_general_log.test
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-11-04 16:07:37 +0000
+++ b/sql/rpl_slave.cc	2011-11-09 13:22:47 +0000
@@ -5805,7 +5805,7 @@ static int safe_connect(THD* thd, MYSQL*
 static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
                              bool reconnect, bool suppress_warnings)
 {
-  int slave_was_killed;
+  int slave_was_killed= 0;
   int last_errno= -2;                           // impossible error
   ulong err_count=0;
   char llbuff[22];
@@ -5871,8 +5871,16 @@ static int connect_to_master(THD* thd, M
   if (!mi->is_start_user_configured())
     sql_print_warning("%s", ER(ER_INSECURE_CHANGE_MASTER));
 
-  bool error_pwd= mi->get_password(password, &password_size);
-  while (!error_pwd && !(slave_was_killed = io_slave_killed(thd,mi))
+  if (mi->get_password(password, &password_size))
+  {
+    mi->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
+               ER(ER_SLAVE_FATAL_ERROR),
+               "Unable to configure password when attempting to "
+               "connect to the master server. Connection attempt "
+               "terminated.");
+    DBUG_RETURN(1);
+  }
+  while (!(slave_was_killed = io_slave_killed(thd,mi))
          && (reconnect ? mysql_reconnect(mysql) != 0 :
              mysql_real_connect(mysql, mi->host, mi->get_user(),
                                 password, 0, mi->port, 0, client_flag) == 0))

No bundle (reason: useless for push emails).