database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-03-27 15:59:48 +02:00
parent 5954e94fa7 09cefdd542
commit e0c2ff9df7
7 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,8 @@ id select_type table type possible_keys key key_len ref rows Extra
3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used 3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
explain select a,b from t1 union select 1 limit 0; explain select a,b from t1 union select 1 limit 0;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE 1 PRIMARY t1 ALL NULL NULL NULL NULL 4
2 UNION NULL NULL NULL NULL NULL NULL NULL Impossible WHERE 2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
select a,b from t1 into outfile 'skr' union select a,b from t2; select a,b from t1 into outfile 'skr' union select a,b from t2;
ERROR HY000: Wrong usage of UNION and INTO ERROR HY000: Wrong usage of UNION and INTO
select a,b from t1 order by a union select a,b from t2; select a,b from t1 order by a union select a,b from t2;

10
sql/item_subselect.cc
View File

@ -883,13 +883,9 @@ subselect_single_select_engine(st_select_lex *select,
{ {
select_lex= select; select_lex= select;
SELECT_LEX_UNIT *unit= select_lex->master_unit(); SELECT_LEX_UNIT *unit= select_lex->master_unit();
unit->offset_limit_cnt= unit->global_parameters->offset_limit; unit->set_limit(unit->global_parameters->select_limit,
unit->select_limit_cnt= unit->global_parameters->select_limit+ unit->global_parameters->offset_limit,
unit->global_parameters ->offset_limit; select_lex);
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)
select_lex->options&= ~OPTION_FOUND_ROWS;
unit->item= item; unit->item= item;
this->select_lex= select_lex; this->select_lex= select_lex;
} }

12
sql/sql_lex.cc
View File

@ -1001,6 +1001,7 @@ void st_select_lex_unit::init_query()
table= 0; table= 0;
fake_select_lex= 0; fake_select_lex= 0;
cleaned= 0; cleaned= 0;
found_rows_for_union= 0;
} }
void st_select_lex::init_query() void st_select_lex::init_query()
@ -1634,6 +1635,17 @@ void st_select_lex::print_limit(THD *thd, String *str)
} }
} }
void st_select_lex_unit::set_limit(ha_rows limit, ha_rows offset,
SELECT_LEX *sl)
{
offset_limit_cnt= offset;
select_limit_cnt= limit+offset;
if (select_limit_cnt < limit)
select_limit_cnt= HA_POS_ERROR; // no limit
if (select_limit_cnt == HA_POS_ERROR)
sl->options&= ~OPTION_FOUND_ROWS;
}
/* /*
There are st_select_lex::add_table_to_list & There are st_select_lex::add_table_to_list &
st_select_lex::set_lock_for_tables in sql_parse.cc st_select_lex::set_lock_for_tables in sql_parse.cc

1
sql/sql_lex.h
View File

@ -371,6 +371,7 @@ public:
bool check_updateable(char *db, char *table); bool check_updateable(char *db, char *table);
void print(String *str); void print(String *str);
void set_limit(ha_rows limit, ha_rows offset, st_select_lex *sl);
friend void mysql_init_query(THD *thd, bool lexonly); friend void mysql_init_query(THD *thd, bool lexonly);
friend int subselect_union_engine::exec(); friend int subselect_union_engine::exec();

19
sql/sql_parse.cc
View File

@ -1867,18 +1867,6 @@ mysql_execute_command(THD *thd)
res=0; res=0;
break; // Error message is given break; // Error message is given
} }
/*
In case of single SELECT unit->global_parameters points on first SELECT
TODO: move counters to SELECT_LEX
*/
unit->offset_limit_cnt= (ha_rows) unit->global_parameters->offset_limit;
unit->select_limit_cnt= (ha_rows) (unit->global_parameters->select_limit+
unit->global_parameters->offset_limit);
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 && !select_lex->next_select())
select_lex->options&= ~OPTION_FOUND_ROWS;
if (!(res=open_and_lock_tables(thd,tables))) if (!(res=open_and_lock_tables(thd,tables)))
{ {
@ -2191,11 +2179,8 @@ mysql_execute_command(THD *thd)
if (tables && check_table_access(thd, SELECT_ACL, tables,0)) if (tables && check_table_access(thd, SELECT_ACL, tables,0))
goto error; // Error message is given goto error; // Error message is given
select_lex->options|= SELECT_NO_UNLOCK; select_lex->options|= SELECT_NO_UNLOCK;
unit->offset_limit_cnt= select_lex->offset_limit; unit->set_limit(select_lex->select_limit, select_lex->offset_limit,
unit->select_limit_cnt= select_lex->select_limit+ select_lex);
select_lex->offset_limit;
if (unit->select_limit_cnt < select_lex->select_limit)
unit->select_limit_cnt= HA_POS_ERROR; // No limit
if (!(res=open_and_lock_tables(thd,tables))) if (!(res=open_and_lock_tables(thd,tables)))
{ {

27
sql/sql_select.cc
View File

@ -175,8 +175,13 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
DBUG_ENTER("handle_select"); DBUG_ENTER("handle_select");
if (select_lex->next_select()) if (select_lex->next_select())
res=mysql_union(thd, lex, result, &lex->unit); res= mysql_union(thd, lex, result, &lex->unit);
else else
{
SELECT_LEX_UNIT *unit= &lex->unit;
unit->set_limit(unit->global_parameters->select_limit,
unit->global_parameters->offset_limit,
select_lex);
res= mysql_select(thd, &select_lex->ref_pointer_array, res= mysql_select(thd, &select_lex->ref_pointer_array,
(TABLE_LIST*) select_lex->table_list.first, (TABLE_LIST*) select_lex->table_list.first,
select_lex->with_wild, select_lex->item_list, select_lex->with_wild, select_lex->item_list,
@ -188,7 +193,8 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
select_lex->having, select_lex->having,
(ORDER*) lex->proc_list.first, (ORDER*) lex->proc_list.first,
select_lex->options | thd->options, select_lex->options | thd->options,
result, &(lex->unit), &(lex->select_lex)); result, unit, select_lex);
}
/* Don't set res if it's -1 as we may want this later */ /* Don't set res if it's -1 as we may want this later */
DBUG_PRINT("info",("res: %d report_error: %d", res, DBUG_PRINT("info",("res: %d report_error: %d", res,
@ -1009,12 +1015,8 @@ JOIN::reinit()
{ {
DBUG_ENTER("JOIN::reinit"); DBUG_ENTER("JOIN::reinit");
/* TODO move to unit reinit */ /* TODO move to unit reinit */
unit->offset_limit_cnt =select_lex->offset_limit; unit->set_limit(select_lex->select_limit, select_lex->offset_limit,
unit->select_limit_cnt =select_lex->select_limit+select_lex->offset_limit; select_lex);
if (unit->select_limit_cnt < select_lex->select_limit)
unit->select_limit_cnt= HA_POS_ERROR; // no limit
if (unit->select_limit_cnt == HA_POS_ERROR)
select_lex->options&= ~OPTION_FOUND_ROWS;
if (setup_tables(tables_list, 1)) if (setup_tables(tables_list, 1))
DBUG_RETURN(1); DBUG_RETURN(1);
@ -9258,6 +9260,15 @@ int mysql_explain_select(THD *thd, SELECT_LEX *select_lex, char const *type,
select_lex->type= type; select_lex->type= type;
thd->lex->current_select= select_lex; thd->lex->current_select= select_lex;
SELECT_LEX_UNIT *unit= select_lex->master_unit(); SELECT_LEX_UNIT *unit= select_lex->master_unit();
if (select_lex == unit->global_parameters &&
unit->first_select()->next_select())
{
unit->offset_limit_cnt= 0;
unit->select_limit_cnt= HA_POS_ERROR;
}
else
unit->set_limit(select_lex->select_limit, select_lex->offset_limit,
select_lex);
int res= mysql_select(thd, &select_lex->ref_pointer_array, int res= mysql_select(thd, &select_lex->ref_pointer_array,
(TABLE_LIST*) select_lex->table_list.first, (TABLE_LIST*) select_lex->table_list.first,
select_lex->with_wild, select_lex->item_list, select_lex->with_wild, select_lex->item_list,

31
sql/sql_union.cc
View File

@ -151,11 +151,8 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
sl->options | thd_arg->options | additional_options, sl->options | thd_arg->options | additional_options,
tmp_result); tmp_result);
thd_arg->lex->current_select= sl; thd_arg->lex->current_select= sl;
offset_limit_cnt= sl->offset_limit; set_limit(sl->select_limit, sl->offset_limit, sl);
select_limit_cnt= sl->select_limit+sl->offset_limit; if (sl->braces)
if (select_limit_cnt < sl->select_limit)
select_limit_cnt= HA_POS_ERROR; // no limit
if (select_limit_cnt == HA_POS_ERROR || sl->braces)
sl->options&= ~OPTION_FOUND_ROWS; sl->options&= ~OPTION_FOUND_ROWS;
res= join->prepare(&sl->ref_pointer_array, res= join->prepare(&sl->ref_pointer_array,
@ -376,18 +373,15 @@ int st_select_lex_unit::exec()
if (!thd->is_fatal_error) // Check if EOM if (!thd->is_fatal_error) // Check if EOM
{ {
ulong options_tmp= thd->options;
thd->lex->current_select= fake_select_lex; thd->lex->current_select= fake_select_lex;
offset_limit_cnt= global_parameters->offset_limit; fake_select_lex->options= thd->options;
select_limit_cnt= global_parameters->select_limit + set_limit(global_parameters->select_limit,
global_parameters->offset_limit; global_parameters->offset_limit,
fake_select_lex);
if (select_limit_cnt < global_parameters->select_limit) if (found_rows_for_union && !thd->lex->describe &&
select_limit_cnt= HA_POS_ERROR; // no limit select_limit_cnt != HA_POS_ERROR)
if (select_limit_cnt == HA_POS_ERROR) fake_select_lex->options|= OPTION_FOUND_ROWS;
options_tmp&= ~OPTION_FOUND_ROWS;
else if (found_rows_for_union && !thd->lex->describe)
options_tmp|= OPTION_FOUND_ROWS;
fake_select_lex->ftfunc_list= &empty_list; fake_select_lex->ftfunc_list= &empty_list;
fake_select_lex->table_list.link_in_list((byte *)&result_table_list, fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
(byte **) (byte **)
@ -399,7 +393,8 @@ int st_select_lex_unit::exec()
allocate JOIN for fake select only once (privent allocate JOIN for fake select only once (privent
mysql_select automatic allocation) mysql_select automatic allocation)
*/ */
fake_select_lex->join= new JOIN(thd, item_list, thd->options, result); fake_select_lex->join= new JOIN(thd, item_list,
fake_select_lex->options, result);
/* /*
Fake st_select_lex should have item list for correctref_array Fake st_select_lex should have item list for correctref_array
allocation. allocation.
@ -414,7 +409,7 @@ int st_select_lex_unit::exec()
delete tab->select; delete tab->select;
delete tab->quick; delete tab->quick;
} }
join->init(thd, item_list, thd->options, result); join->init(thd, item_list, fake_select_lex->options, result);
} }
res= mysql_select(thd, &fake_select_lex->ref_pointer_array, res= mysql_select(thd, &fake_select_lex->ref_pointer_array,
&result_table_list, &result_table_list,
@ -422,7 +417,7 @@ int st_select_lex_unit::exec()
global_parameters->order_list.elements, global_parameters->order_list.elements,
(ORDER*)global_parameters->order_list.first, (ORDER*)global_parameters->order_list.first,
(ORDER*) NULL, NULL, (ORDER*) NULL, (ORDER*) NULL, NULL, (ORDER*) NULL,
options_tmp | SELECT_NO_UNLOCK, fake_select_lex->options | SELECT_NO_UNLOCK,
result, this, fake_select_lex); result, this, fake_select_lex);
if (!res) if (!res)
thd->limit_found_rows = (ulonglong)table->file->records + add_rows; thd->limit_found_rows = (ulonglong)table->file->records + add_rows;