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

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
This commit is contained in:
stewart@willster.(none)
2006-10-18 18:51:39 +10:00
parent 73831dad50 fff4559edd
commit 71636edc16
26 changed files with 79 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_union.cc
View File

@ -496,7 +496,12 @@ bool st_select_lex_unit::exec()
DBUG_RETURN(res);
}
/* Needed for the following test and for records_at_start in next loop */
table->file->info(HA_STATUS_VARIABLE);
int error= table->file->info(HA_STATUS_VARIABLE);
if(error)
{
table->file->print_error(error, MYF(0));
DBUG_RETURN(1);
}
if (found_rows_for_union && !sl->braces &&
select_limit_cnt != HA_POS_ERROR)
{