Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23

into sinisa.nasamreza.org:/mnt/work/mysql

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
7a01adf5 · Sinisa@sinisa.nasamreza.org · 30ae0cdc · cf2ebdba · 7a01adf5
Commit 7a01adf5 authored Apr 29, 2003 by Sinisa@sinisa.nasamreza.org
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2155,7 +2155,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,

  if ((thd->master_access & want_access) == want_access)
  {
-    *save_priv=thd->master_access;
+    *save_priv=thd->master_access | thd->db_access;
    return FALSE;
  }
  if ((want_access & ~thd->master_access) & ~(DB_ACLS | EXTRA_ACL) ||