database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
bell@laptop.sanja.is.com.ua
2003-08-19 20:14:35 +03:00
parent 85f397781b 9333e292ec
commit dd9cbce47b
421 changed files with 14590 additions and 3777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_union.cc
View File

@@ -83,7 +83,7 @@ bool select_union::send_data(List<Item> &values)
{
thd->clear_error(); // do not report user about table overflow
if (create_myisam_from_heap(thd, table, &tmp_table_param,
info.last_errno, 0))
info.last_errno, 1))
return 1;
}
else
@@ -201,7 +201,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result,
select_limit_cnt= sl->select_limit+sl->offset_limit;
if (select_limit_cnt < sl->select_limit)
select_limit_cnt= HA_POS_ERROR; // no limit
if (select_limit_cnt == HA_POS_ERROR)
if (select_limit_cnt == HA_POS_ERROR && !sl->braces)
sl->options&= ~OPTION_FOUND_ROWS;
res= join->prepare(&sl->ref_pointer_array,