diff options
| author | unknown <evgen@sunlight.local> | 2007-09-27 23:45:39 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-27 23:45:39 +0400 |
| commit | 464a9255abcacacc83b0e17976ddb12ed84a4afe (patch) | |
| tree | d504837ae974cd222c97b1bd92d0ed1b37ed45d9 /sql/sql_view.cc | |
| parent | 7ee858eba83a428b003abb427ddc34859e5f9170 (diff) | |
| parent | 1cb6dc2b37c9dcf9bfeed2471b8562e78a33b25f (diff) | |
| download | mariadb-git-464a9255abcacacc83b0e17976ddb12ed84a4afe.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into sunlight.local:/local_work/29908-bug-5.0-opt-mysql
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index b938818000e..297edd0d90d 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -223,9 +223,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, { LEX *lex= thd->lex; bool link_to_local; -#ifndef NO_EMBEDDED_ACCESS_CHECKS - bool definer_check_is_needed= mode != VIEW_ALTER || lex->definer; -#endif /* first table in list is target VIEW name => cut off it */ TABLE_LIST *view= lex->unlink_first_table(&link_to_local); TABLE_LIST *tables= lex->query_tables; @@ -280,7 +277,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, - same as current user - current user has SUPER_ACL */ - if (definer_check_is_needed && + if (lex->definer && (strcmp(lex->definer->user.str, thd->security_ctx->priv_user) != 0 || my_strcasecmp(system_charset_info, lex->definer->host.str, |