diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-10-19 17:43:30 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-10-19 17:43:30 +0300 |
| commit | 8f690df2fcd923865acb608b6220c30fff7191df (patch) | |
| tree | 4fac432f8c94c47d262609dc9627475c5fd8e107 /sql/sql_union.cc | |
| parent | 8faa67d1f16b6c4bbc4b7cd932916b4b62431561 (diff) | |
| download | mariadb-git-8f690df2fcd923865acb608b6220c30fff7191df.tar.gz | |
Unchecked changes, so that I could run mysql-test.
If I ruined anything, write your complaints to sasha@mysql.com
sql/sql_delete.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_lex.h:
Unchecked changes, so that I could run mysql-test
sql/sql_parse.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_union.cc:
Unchecked changes, so that I could run mysql-test
sql/sql_yacc.yy:
Unchecked changes, so that I could run mysql-test
BitKeeper/etc/ignore:
Added libmysqld/examples/link_sources to the ignore list
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c0ec6c81575..0d8a6dc4ed1 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -27,7 +27,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) { - SELECT_LEX *sl, *last_sl; + SELECT_LEX *sl, *last_sl, lex_sl; ORDER *order; List<Item> item_list; TABLE *table; @@ -38,7 +38,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) DBUG_ENTER("mysql_union"); /* Fix tables 'to-be-unioned-from' list to point at opened tables */ - for (sl=&lex->select_lex; sl; sl=sl->next) + for (sl=&lex->select_lex; sl && sl->linkage != NOT_A_SELECT; sl=sl->next) { for (TABLE_LIST *cursor= (TABLE_LIST *)sl->table_list.first; cursor; @@ -46,6 +46,14 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) cursor->table= ((TABLE_LIST*) cursor->table)->table; } + if (sl) + { + lex_sl=*sl; + sl=(SELECT_LEX *)NULL; + } + else + lex_sl.linkage=UNSPECIFIED_TYPE; + /* Find last select part as it's here ORDER BY and GROUP BY is stored */ for (last_sl= &lex->select_lex; last_sl->next; @@ -60,7 +68,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) sl->item_list, sl->where, sl->ftfunc_list, - (ORDER*) 0, + (sl->braces) ? (ORDER*) 0 : (ORDER *) sl->order_list.first, (ORDER*) sl->group_list.first, sl->having, (ORDER*) NULL, @@ -71,7 +79,8 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) DBUG_RETURN(0); } - order = (ORDER *) last_sl->order_list.first; + order = (lex_sl.linkage == UNSPECIFIED_TYPE) ? (ORDER *) last_sl->order_list.first : (ORDER *) lex_sl.order_list.first; + { Item *item; List_iterator<Item> it(lex->select_lex.item_list); @@ -118,7 +127,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) sl->item_list, sl->where, sl->ftfunc_list, - (ORDER*) 0, + (sl->braces) ? (ORDER*) 0 : (ORDER *)sl->order_list.first, (ORDER*) sl->group_list.first, sl->having, (ORDER*) NULL, @@ -149,10 +158,21 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) (void) it.replace(new Item_field(*field)); } if (!thd->fatal_error) // Check if EOM + { + if (lex_sl.linkage == NOT_A_SELECT && ( lex_sl.select_limit || lex_sl.offset_limit)) + { + thd->offset_limit=lex_sl.offset_limit; + thd->select_limit=lex_sl.select_limit+lex_sl.offset_limit; + if (thd->select_limit < lex_sl.select_limit) + thd->select_limit= HA_POS_ERROR; // no limit + if (thd->select_limit == HA_POS_ERROR) + thd->options&= ~OPTION_FOUND_ROWS; + } res=mysql_select(thd,&result_table_list, item_list, NULL, ftfunc_list, order, (ORDER*) NULL, NULL, (ORDER*) NULL, thd->options, result); + } } exit: |