diff options
| author | unknown <serg@serg.mylan> | 2004-11-23 22:21:04 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-23 22:21:04 +0100 |
| commit | 87ec5e46cdfd009f79099ab03efff8781d1c1325 (patch) | |
| tree | 848f5a3f64e3e2db8dfa0e6f1667b918b050d3e2 /sql/sp.cc | |
| parent | 7802ba97b4e89092fb16d2f7f92de9d97f85c610 (diff) | |
| parent | b915999a96a8c5b08c81bbe0377f2121955d87af (diff) | |
| download | mariadb-git-87ec5e46cdfd009f79099ab03efff8781d1c1325.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 5798eedbad9..a39380d7276 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1153,7 +1153,6 @@ sp_change_db(THD *thd, char *name, bool no_access_check) int length, db_length; char *dbname=my_strdup((char*) name,MYF(MY_WME)); char path[FN_REFLEN]; - ulong db_access; HA_CREATE_INFO create; DBUG_ENTER("sp_change_db"); DBUG_PRINT("enter", ("db: %s, no_access_check: %d", name, no_access_check)); @@ -1174,6 +1173,8 @@ sp_change_db(THD *thd, char *name, bool no_access_check) #ifndef NO_EMBEDDED_ACCESS_CHECKS if (! no_access_check) { + ulong db_access; + if (test_all_bits(thd->master_access,DB_ACLS)) db_access=DB_ACLS; else |