bzr push into mysql-trunk branch (jon.hauglid:3982 to 3983)

[Jon Olav Hauglid]

 3983 Jon Olav Hauglid	2012-06-10
      Fix two compilation warnings/errors:
      
      GCC 4.6.3
      /sql/sql_acl.cc: In function 'int replace_user_table(THD*, TABLE*, LEX_USER*, ulong, bool, bool, bool)':
      /sql/sql_acl.cc:2701:8: error: variable 'sha2_plugin' set but not used [-Werror=unused-but-set-variable]
      
      Clang 4.1
      /mysys_ssl/my_default.cc:930:15: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]

    modified:
      mysys_ssl/my_default.cc
      sql/sql_acl.cc
 3982 Nirbhay Choubey	2012-06-09
      WL#5603 : Revise how we handle passwords on
                the command line
      
      Fix for the following build error :
      "suggest a space before ';' or explicit braces
       around empty body in 'for' statement"

    modified:
      mysys_ssl/my_default.cc
      mysys_ssl/my_getopt.cc
=== modified file 'mysys_ssl/my_default.cc'
--- a/mysys_ssl/my_default.cc	2012-06-09 14:11:09 +0000
+++ b/mysys_ssl/my_default.cc	2012-06-10 09:28:18 +0000
@@ -927,7 +927,7 @@ static int search_default_file_with_ext(
       continue;
 
     /* Configuration File Directives */
-    if ((*ptr == '!'))
+    if (*ptr == '!')
     {
       if (recursion_level >= max_recursion_level)
       {

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2012-06-04 15:35:18 +0000
+++ b/sql/sql_acl.cc	2012-06-10 09:28:18 +0000
@@ -2697,9 +2697,6 @@ static int replace_user_table(THD *thd, 
   char what= (revoke_grant) ? 'N' : 'Y';
   uchar user_key[MAX_KEY_LENGTH];
   LEX *lex= thd->lex;
-#if defined(HAVE_OPENSSL)
-  bool sha2_plugin= false;
-#endif
   DBUG_ENTER("replace_user_table");
 
   mysql_mutex_assert_owner(&acl_cache->lock);
@@ -2902,7 +2899,6 @@ static int replace_user_table(THD *thd, 
 #if defined(HAVE_OPENSSL)
       if (combo->plugin.str == sha256_password_plugin_name.str)
       {
-        sha2_plugin= true;
         table->field[MYSQL_USER_FIELD_AUTHENTICATION_STRING]->
           store(password, password_len, &my_charset_utf8_bin);
         combo->auth.str= password;

No bundle (reason: useless for push emails).