diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-24 16:03:06 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-24 16:03:06 +0300 |
| commit | 35b15c8d6a25c0fea1e53a6c2e4d5f333fd4997a (patch) | |
| tree | 293548979cd4a16e20373e3943205173c8c71074 /sql/sql_view.cc | |
| parent | cf0dd73ccbddf94df622f8d329c3d5dd77c62243 (diff) | |
| parent | ae5865ff430cc6939f5e94abc1645e27899ab823 (diff) | |
| download | mariadb-git-35b15c8d6a25c0fea1e53a6c2e4d5f333fd4997a.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B27786-addon-5.1-opt
mysql-test/r/subselect3.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 453cbbc091e..9dc7d2100d6 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -829,7 +829,7 @@ loop_out: UNION */ if (view->updatable_view && - !lex->select_lex.next_select() && + !lex->select_lex.master_unit()->is_union() && !((TABLE_LIST*)lex->select_lex.table_list.first)->next_local && find_table_in_global_list(lex->query_tables->next_global, lex->query_tables->db, |