Fix two compilation warnings/errors:

jhauglid · jhauglid · commit 13db625c1423 · 2012-06-10T11:28:18.000+02:00
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]
diff --git a/mysys_ssl/my_default.cc b/mysys_ssl/my_default.cc
@@ -927,7 +927,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
       continue;
 
     /* Configuration File Directives */
-    if ((*ptr == '!'))
+    if (*ptr == '!')
     {
       if (recursion_level >= max_recursion_level)
       {
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
@@ -2697,9 +2697,6 @@ static int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
   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, TABLE *table, LEX_USER *combo,
 #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;

Original file line number	Diff line number	Diff line change
`@@ -927,7 +927,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,`
`927`	`927`	`continue;`
`928`	`928`
`929`	`929`	`/* Configuration File Directives */`
`930`		`- if ((*ptr == '!'))`
	`930`	`+ if (*ptr == '!')`
`931`	`931`	`{`
`932`	`932`	`if (recursion_level >= max_recursion_level)`
`933`	`933`	`{`