diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-23 20:39:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-23 20:39:36 +0300 |
| commit | 10bd14dee8488b59798e9b24db1c50759e9242ae (patch) | |
| tree | dd3586b209432966efbbf77cd272760438711106 /sql/sql_union.cc | |
| parent | b42ca98d34a2e834dfc454338493fa26553c8d20 (diff) | |
| parent | a8caad316a89d6eeb8c22e70bc7a5fd4cf6ce904 (diff) | |
| download | mariadb-git-10bd14dee8488b59798e9b24db1c50759e9242ae.tar.gz | |
merge
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index fbfafd41420..88d2f7a1d25 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -67,10 +67,11 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) */ lex_sl= sl; order= (ORDER *) lex_sl->order_list.first; - found_rows_for_union = lex->select_lex.options & OPTION_FOUND_ROWS && !describe && sl->select_limit; + found_rows_for_union = (lex->select_lex.options & OPTION_FOUND_ROWS && + !describe && sl->select_limit); if (found_rows_for_union) lex->select_lex.options ^= OPTION_FOUND_ROWS; -// This is done to eliminate unnecessary slowing down of the first query + // This is done to eliminate unnecessary slowing down of the first query if (!order || !describe) last_sl->next=0; // Remove this extra element } @@ -201,7 +202,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) else { thd->offset_limit= 0; - thd->select_limit= thd->default_select_limit; + thd->select_limit= thd->variables.select_limit; } if (describe) thd->select_limit= HA_POS_ERROR; // no limit |