database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Removed wrong implementation of CUBE/ROLLUP

Browse Source 
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
This commit is contained in:
monty@mashka.mysql.fi
2002-07-24 19:55:08 +03:00
parent 00089b8148
commit c702a1f8fd
58 changed files with 504 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_select.cc
View File

@@ -146,7 +146,7 @@ static bool update_sum_func(Item_sum **func);
static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
bool distinct, const char *message=NullS);
static void describe_info(JOIN *join, const char *info);
extern int handle_olaps(LEX *lex, SELECT_LEX *select);
/*
This handles SELECT with and without UNION
*/
@@ -155,23 +155,26 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
{
int res;
register SELECT_LEX *select_lex = &lex->select_lex;
#ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1
if (lex->olap)
{
SELECT_LEX *sl, *last_sl;
int returned;
for (sl= &lex->select_lex;sl;sl=sl->next)
SELECT_LEX *sl, *sl_next;
int error;
for (sl= &select_lex; sl; sl=sl_next)
{
if (sl->olap != NON_EXISTING_ONE)
sl_next=sl->next; // Save if sl->next changes
if (sl->olap != UNSPECIFIED_OLAP_TYPE)
{
last_sl=sl->next;
if ((returned=handle_olaps(lex,sl)))
return returned;
lex->last_selects->next=sl=last_sl;
if (!sl) break;
if ((error=handle_olaps(lex,sl)))
return error;
lex->last_selects->next=sl_next;
}
}
lex->select = select_lex;
}
#endif DISABLED_UNTIL_REWRITTEN_IN_4_1
if (select_lex->next)
res=mysql_union(thd,lex,result);
else