bzr push into mysql-trunk branch (luis.soares:3464 to 3465) WL#4143

[Luis Soares]

 3465 Luis Soares	2011-11-11
      WL#4143
      
      Follow-up patch to fix typo in the error code symbolic name:
      ER_SQLTHREAD_WITH_SECURE_SALVE --> ER_SQLTHREAD_WITH_SECURE_SLAVE

    modified:
      mysql-test/suite/rpl/t/rpl_master_connection.test
      sql/share/errmsg-utf8.txt
      sql/sql_yacc.yy
 3464 Luis Soares	2011-11-09
      WL#4143
      
      Fixing a -Werror on behalf of Alfranio (slave_was_killed= 0).
      
      In addition, deployed an error message when get_password
      fails to retrieve a password when attempting to connect to the
      master and made the function return immediately. Before, there
      could be the case that the slave failed to retrieve the password
      and later assumed that the connection was established, when 
      indeed it was not.

    modified:
      sql/rpl_slave.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_master_connection.test'
--- a/mysql-test/suite/rpl/t/rpl_master_connection.test	2011-11-04 15:25:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_master_connection.test	2011-11-11 17:37:44 +0000
@@ -66,15 +66,15 @@ SET SQL_LOG_BIN=1;
 CHANGE MASTER TO MASTER_USER= 'DOES NOT EXIST', MASTER_PASSWORD = 'DOES NOT EXIST';
 
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
---error ER_SQLTHREAD_WITH_SECURE_SALVE
+--error ER_SQLTHREAD_WITH_SECURE_SLAVE
 --eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password'
 
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
---error ER_SQLTHREAD_WITH_SECURE_SALVE
+--error ER_SQLTHREAD_WITH_SECURE_SLAVE
 --eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin'
 
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR
---error ER_SQLTHREAD_WITH_SECURE_SALVE
+--error ER_SQLTHREAD_WITH_SECURE_SLAVE
 --eval START SLAVE SQL_THREAD USER= 'regular_user_p' PASSWORD= 'password' DEFAULT_AUTH= 'auth_test_plugin' PLUGIN_DIR= '$PLUGIN_AUTH_DIR'
 
 --replace_result $PLUGIN_AUTH_DIR PLUGIN_AUTH_DIR

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2011-11-04 16:07:37 +0000
+++ b/sql/share/errmsg-utf8.txt	2011-11-11 17:37:44 +0000
@@ -6605,5 +6605,5 @@ ER_INSECURE_PLAIN_TEXT
 ER_INSECURE_CHANGE_MASTER
   eng "Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives."
 
-ER_SQLTHREAD_WITH_SECURE_SALVE
+ER_SQLTHREAD_WITH_SECURE_SLAVE
   eng "Setting authentication options is not possible when only the Slave SQL Thread is being started."

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-11-04 16:07:37 +0000
+++ b/sql/sql_yacc.yy	2011-11-11 17:37:44 +0000
@@ -7203,7 +7203,7 @@ slave:
                  Lex->slave_connection.plugin_auth ||
                  Lex->slave_connection.plugin_dir))
             {
-              my_error(ER_SQLTHREAD_WITH_SECURE_SALVE, MYF(0));
+              my_error(ER_SQLTHREAD_WITH_SECURE_SLAVE, MYF(0));
               MYSQL_YYABORT;
             }
           }

No bundle (reason: useless for push emails).