database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 4.0.14

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-08-11 22:44:43 +03:00
parent 1279f9b024 6e7a509d06
commit 2263e3e51f
363 changed files with 13819 additions and 2895 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
@ -211,7 +211,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,