diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-20 12:06:52 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-04-20 12:06:52 +0300 |
| commit | 48039ab277838024be85836cc3378a903ad2794b (patch) | |
| tree | 503df238204acc944162c36965213aa279fba89c /sql/sql_view.cc | |
| parent | cc76701e8f47ca52ca209150f49ba665a215c1d0 (diff) | |
| parent | e0444ba436798b25c16bfe0097b87cc1d39a7b9a (diff) | |
| download | mariadb-git-48039ab277838024be85836cc3378a903ad2794b.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27786-addon-5.1-opt
mysql-test/r/subselect3.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/t/view.test:
fixed testcase merge 5.0->5.1
sql/sql_lex.h:
merge fixes : 5.0->5.1
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index f84847f2f9c..ee99a2974f4 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1270,13 +1270,18 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, unit->slave= save_slave; // fix include_down initialisation } + /* + We can safely ignore the VIEW's ORDER BY if we merge into union + branch, as order is not important there. + */ + if (!table->select_lex->master_unit()->is_union()) + table->select_lex->order_list.push_back(&lex->select_lex.order_list); /* This SELECT_LEX will be linked in global SELECT_LEX list to make it processed by mysql_handle_derived(), but it will not be included to SELECT_LEX tree, because it will not be executed - */ - table->select_lex->order_list.push_back(&lex->select_lex.order_list); + */ goto ok; } |