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

union.result:

Browse Source 
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-08-23 21:21:02 +03:00
parent 7635c537be
commit 4ba1506244
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -941,6 +941,7 @@ JOIN::exec()
DBUG_ENTER("JOIN::exec");
error= 0;
thd->limit_found_rows= thd->examined_row_count= 0;
if (procedure)
{
if (procedure->change_columns(fields_list) ||
@ -1323,6 +1324,8 @@ JOIN::exec()
thd->proc_info="Sending data";
error= thd->net.report_error ||
do_select(curr_join, curr_fields_list, NULL, procedure);
thd->limit_found_rows= curr_join->send_records;
thd->examined_row_count= curr_join->examined_rows;
DBUG_VOID_RETURN;
}
@ -1434,8 +1437,6 @@ err:
(join->tmp_join->error=join->error,join->tmp_join):
join);
thd->limit_found_rows= curr_join->send_records;
thd->examined_row_count= curr_join->examined_rows;
thd->proc_info="end";
err= join->cleanup();
if (thd->net.report_error)