mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2004-10-05 14:54:40 +03:00
commit 19c112dfb5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_union.cc
View file

@ -39,6 +39,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
TABLE_LIST *first_table=(TABLE_LIST *)lex->select_lex.table_list.first;
TMP_TABLE_PARAM tmp_table_param;
select_union *union_result;
ha_rows examined_rows= 0;
DBUG_ENTER("mysql_union");
/* Fix tables 'to-be-unioned-from' list to point at opened tables */
@ -202,6 +203,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
union_result);
if (res)
goto exit;
examined_rows+= thd->examined_row_count;
/* Needed for the following test and for records_at_start in next loop */
table->file->info(HA_STATUS_VARIABLE);
if (found_rows_for_union & sl->options)
@ -258,12 +260,15 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
if (describe)
thd->select_limit= HA_POS_ERROR; // no limit
res=mysql_select(thd,&result_table_list,
res= mysql_select(thd,&result_table_list,
item_list, NULL, (describe) ? 0 : order,
(ORDER*) NULL, NULL, (ORDER*) NULL,
thd->options, result);
if (!res)
thd->limit_found_rows = (ulonglong)table->file->records + add_rows;
{
thd->limit_found_rows= (ulonglong)table->file->records + add_rows;
thd->examined_row_count+= examined_rows;
}
}
}