diff options
author | unknown <bell@sanja.is.com.ua> | 2002-06-01 23:35:36 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-06-01 23:35:36 +0300 |
commit | a532bfb2ea0a0d1cfc0c8d25e6a18cf5a8c0c5bc (patch) | |
tree | bea12da47b7406eaa62cc66a88289b0f1ad7aed2 /sql/item_subselect.cc | |
parent | 56f154165c9ea67a385f194d6c5709b673abb927 (diff) | |
download | mariadb-git-a532bfb2ea0a0d1cfc0c8d25e6a18cf5a8c0c5bc.tar.gz |
new subselect tests
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX
mysql-test/r/subselect.result:
new subselect tests
mysql-test/t/subselect.test:
new subselect tests
sql/item.cc:
marking as depended _ALL_ subselects under select from wich depend
sql/item_subselect.cc:
limit fixed
TODO added
sql/sql_class.cc:
AVG & STD function with subselects fixed
sql/sql_lex.h:
sort_default removed
sql/sql_parse.cc:
limit fixed
sql/sql_select.cc:
fixed to be subselect compatible
sql/sql_yacc.yy:
sort_default removed
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 72bbbcba5a7..e18c8d78830 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -23,6 +23,7 @@ SUBSELECT TODO: - remove double 'having' & 'having_list' from JOIN (sql_select.h/sql_select.cc) + - subselect in HAVING clause - add subselect union select (sql_union.cc) */ @@ -43,7 +44,7 @@ Item_subselect::Item_subselect(THD *thd, st_select_lex *select_lex): SELECT_LEX_UNIT *unit= select_lex->master_unit(); unit->offset_limit_cnt= unit->global_parameters->offset_limit; unit->select_limit_cnt= unit->global_parameters->select_limit+ - select_lex->offset_limit; + unit->global_parameters ->offset_limit; if (unit->select_limit_cnt < unit->global_parameters->select_limit) unit->select_limit_cnt= HA_POS_ERROR; // no limit if (unit->select_limit_cnt == HA_POS_ERROR) @@ -148,9 +149,6 @@ int Item_subselect::exec() join->thd->lex.select= select_lex; join->exec(); join->thd->lex.select= save_select; - //if (!executed) - //No rows returned => value is null (returned as inited) - // executed= 1; return join->error; } return 0; |