Commit 0e94cd14 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
parents 34a2fa26 89a5b23d

mysql-test/r/skip_grants.result

+4 −0
Original line number Diff line number Diff line
@@ -8,3 +8,7 @@ ERROR HY000: View definer is not fully qualified 
drop table t1;

create procedure f1() select 1;

drop procedure f1;

create table t1 (a int);

create definer='user'@'host' sql security definer view v1 as select * from t1;

drop view v1;

drop table t1;

mysql-test/t/skip_grants.test

+8 −0
Original line number Diff line number Diff line
@@ -19,3 +19,11 @@ drop table t1; 
#

create procedure f1() select 1;

drop procedure f1;



#

# BUG#13504: creation view with DEFINER clause if --skip-grant-tables

#

create table t1 (a int);

create definer='user'@'host' sql security definer view v1 as select * from t1;

drop view v1;

drop table t1;

sql/sql_acl.cc

+5 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,11 @@ bool change_password(THD *thd, const char *host, const char *user, 
bool is_acl_user(const char *host, const char *user)

{

  bool res;



  /* --skip-grants */

  if (!initialized)

    return TRUE;



  VOID(pthread_mutex_lock(&acl_cache->lock));

  res= find_acl_user(host, user, TRUE) != NULL;

  VOID(pthread_mutex_unlock(&acl_cache->lock));