diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:04:05 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:04:05 +0500 |
| commit | b4fab0eb9447df5615cbe0e2d2f3f778634ce2ba (patch) | |
| tree | dd12dd5de5e9637089bccb47195671b7d59ace38 /sql/sql_base.cc | |
| parent | 5152132b47318438eb5773238c05630e2b206469 (diff) | |
| parent | 93e11dce942e8aec8501982fe3e664a9d4abd471 (diff) | |
| download | mariadb-git-b4fab0eb9447df5615cbe0e2d2f3f778634ce2ba.tar.gz | |
Merge mysql.com:/home/hf/work/23675/my51-23675
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
merging
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 82cce335f00..8cc54aa3c8c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5852,7 +5852,7 @@ bool setup_tables_and_check_access(THD *thd, { if (leaves_tmp->belong_to_view && check_single_table_access(thd, first_table ? want_access_first : - want_access, leaves_tmp)) + want_access, leaves_tmp, FALSE)) { tables->hide_view_error(thd); return TRUE; |