diff options
| author | unknown <evgen@sunlight.local> | 2006-08-16 18:17:58 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-08-16 18:17:58 +0400 |
| commit | c234aaa0edba09681c54d0e35bdfd28205cce335 (patch) | |
| tree | 21aa033ce047abbfe69a33020cad4baea53c5ec8 /sql/sql_select.cc | |
| parent | 03a5e2e76acd09510e6d95f3b5457ec3bbd6fe79 (diff) | |
| parent | a23d1792bc48c55eb8bee2f3aa947b9599ade190 (diff) | |
| download | mariadb-git-c234aaa0edba09681c54d0e35bdfd28205cce335.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into sunlight.local:/local_work/21261-bug-5.0-mysql
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f1f51bcc95a..01ccbea0651 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -344,7 +344,7 @@ JOIN::prepare(Item ***rref_pointer_array, setup_tables_and_check_access(thd, &select_lex->context, join_list, tables_list, &conds, &select_lex->leaf_tables, FALSE, - SELECT_ACL)) || + SELECT_ACL, SELECT_ACL)) || setup_wild(thd, tables_list, fields_list, &all_fields, wild_num) || select_lex->setup_ref_array(thd, og_num) || setup_fields(thd, (*rref_pointer_array), fields_list, 1, |