database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-12 01:53:02 +03:00
Code Activity

some fixes for SELECT INTO @vars ..

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-10-16 16:55:08 +03:00
parent 51e98da24a
commit cd5ff6301e
5 changed files with 119 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sql/sql_parse.cc
View File

@ -1403,7 +1403,7 @@ mysql_execute_command(THD *thd)
switch (lex->sql_command) {
case SQLCOM_SELECT:
{
select_result *result;
select_result *result=lex->result;
if (select_lex->options & SELECT_DESCRIBE)
lex->exchange=0;
if (tables)
@ -1430,45 +1430,9 @@ mysql_execute_command(THD *thd)
if (unit->select_limit_cnt == HA_POS_ERROR)
select_lex->options&= ~OPTION_FOUND_ROWS;
if (lex->exchange)
if (!result)
{
if (lex->exchange->dumpfile)
{
if (!(result=new select_dump(lex->exchange)))
{
res= -1;
break;
}
}
else
{
if (!(result=new select_export(lex->exchange)))
{
res= -1;
break;
}
}
}
else if (lex->select_into_var_list.elements)
{
if (!(result=new select_dumpvar()))
{
res= -1;
break;
}
}
else
{
if (!(result=new select_send()))
{
res= -1;
#ifdef DELETE_ITEMS
delete select_lex->having;
delete select_lex->where;
#endif
break;
}
else
if ((result=new select_send()))
{
/*
Normal select:
@ -1479,6 +1443,15 @@ mysql_execute_command(THD *thd)
for (table = tables ; table ; table=table->next)
table->lock_type= lex->lock_option;
}
else
{
res= -1;
#ifdef DELETE_ITEMS
delete select_lex->having;
delete select_lex->where;
#endif
break;
}
}
if (!(res=open_and_lock_tables(thd,tables)))
@ -2976,8 +2949,8 @@ mysql_init_select(LEX *lex)
lex->thd->variables.select_limit;
select_lex->olap= UNSPECIFIED_OLAP_TYPE;
lex->exchange= 0;
lex->result= 0;
lex->proc_list.first= 0;
lex->select_into_var_list.empty();
}