1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for OPTION_FOUND_ROWS in UNION's

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-09-13 19:56:58 +03:00
parent 0088e1c657
commit a26847c275
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/subselect.result
View File

@ -1046,6 +1046,8 @@ t1 CREATE TABLE `t1` (
) TYPE=MyISAM CHARSET=latin1
drop table t1;
CREATE TABLE t1 SELECT (SELECT 1 as a UNION SELECT 1+1 limit 1,1) as a;
Warnings:
Warning 1262 Data truncated, NULL supplied to NOT NULL column 'a' at row 1
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (

4
mysql-test/r/union.result
View File

@ -409,7 +409,7 @@ found_rows()
SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2;
a
3
4
5
select found_rows();
found_rows()
6
@ -423,7 +423,7 @@ found_rows()
5
SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1;
a
5
3
(SELECT * FROM t1 ORDER by a) UNION ALL (SELECT * FROM t2 ORDER BY a) ORDER BY A desc LIMIT 4;
a
5

2
sql/sql_parse.cc
View File

@ -1729,7 +1729,7 @@ mysql_execute_command(THD *thd)
if (unit->select_limit_cnt <
(ha_rows) unit->global_parameters->select_limit)
unit->select_limit_cnt= HA_POS_ERROR; // no limit
if (unit->select_limit_cnt == HA_POS_ERROR)
if (unit->select_limit_cnt == HA_POS_ERROR && !select_lex->next_select())
select_lex->options&= ~OPTION_FOUND_ROWS;
if (!(res=open_and_lock_tables(thd,tables)))

5
sql/sql_union.cc
View File

@ -281,7 +281,7 @@ int st_select_lex_unit::exec()
*/
sl->options|= found_rows_for_union;
}
sl->join->select_options=sl->options;
/*
As far as union share table space we should reassign table map,
which can be spoiled by 'prepare' of JOIN of other UNION parts
@ -311,6 +311,7 @@ int st_select_lex_unit::exec()
records_at_start= table->file->records;
sl->join->exec();
res= sl->join->error;
offset_limit_cnt= sl->offset_limit;
if (!res && union_result->flush())
{
thd->lex.current_select= lex_select_save;
@ -332,7 +333,7 @@ int st_select_lex_unit::exec()
We get this from the difference of between total number of possible
rows and actual rows added to the temporary table.
*/
add_rows+= (ha_rows) (thd->limit_found_rows - (ulonglong)
add_rows+= (ulonglong) (thd->limit_found_rows - (ulonglong)
((table->file->records - records_at_start)));
}
}