diff options
author | unknown <gkodinov@mysql.com> | 2006-06-21 12:59:34 +0300 |
---|---|---|
committer | unknown <gkodinov@mysql.com> | 2006-06-21 12:59:34 +0300 |
commit | 5a3d028776d2a629728412cb201266878ed85db6 (patch) | |
tree | a508edcd50cfcd6c43c71e4aff166346a0e692dc /sql/sql_base.cc | |
parent | 2346733139a5286a5d6596f4c086c985e03b8b4f (diff) | |
parent | 6c787151613ad1d443b43389d534861b8bf757e4 (diff) | |
download | mariadb-git-5a3d028776d2a629728412cb201266878ed85db6.tar.gz |
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into mysql.com:/home/kgeorge/mysql/5.0/B20482
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 ba9fa6f6c80..7d14e99fb77 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4546,7 +4546,7 @@ bool setup_tables_and_check_access(THD *thd, for (; leaves_tmp; leaves_tmp= leaves_tmp->next_leaf) if (leaves_tmp->belong_to_view && - check_one_table_access(thd, want_access, leaves_tmp)) + check_single_table_access(thd, want_access, leaves_tmp)) { tables->hide_view_error(thd); return TRUE; |