Fixed _always_ true condition

c4c09afb · Vicențiu Ciorbaru · Sergei Golubchik · fe521dc2 · c4c09afb
Commit c4c09afb authored Oct 18, 2013 by Vicențiu Ciorbaru Committed by Sergei Golubchik Oct 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/sql_parse.cc sql/sql_parse.cc +3 -3

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5203,8 +5203,8 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
      {
        db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db,
                           db_is_pattern);
-	if (sctx->priv_role)
+        if (sctx->priv_role[0])
-	  db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern);
+          db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern);
      }
      else
      {
@@ -5252,7 +5252,7 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
  {
    db_access= acl_get(sctx->host, sctx->ip, sctx->priv_user, db,
                       db_is_pattern);
-    if (sctx->priv_role)
+    if (sctx->priv_role[0])
    {
      db_access|= acl_get("", "", sctx->priv_role, db, db_is_pattern);
    }