Commit ea3e5a5c authored by unknown's avatar unknown

Applying Sinisa's patch:

"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"

parent 22815476
...@@ -3338,7 +3338,6 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result) ...@@ -3338,7 +3338,6 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result)
for (; aux; aux=next) for (; aux; aux=next)
{ {
TABLE_LIST *cursor; TABLE_LIST *cursor;
aux->do_redirect=true;
next= aux->next; next= aux->next;
for (cursor= *result; cursor; cursor=cursor->next) for (cursor= *result; cursor; cursor=cursor->next)
if (!strcmp(cursor->db,aux->db) && if (!strcmp(cursor->db,aux->db) &&
......
...@@ -49,12 +49,8 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) ...@@ -49,12 +49,8 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
for (TABLE_LIST *cursor= (TABLE_LIST *)sl->table_list.first; for (TABLE_LIST *cursor= (TABLE_LIST *)sl->table_list.first;
cursor; cursor;
cursor=cursor->next) cursor=cursor->next)
{
if (cursor->do_redirect) // False if CUBE/ROLLUP
{ {
cursor->table= (my_reinterpret_cast(TABLE_LIST*) (cursor->table))->table; cursor->table= (my_reinterpret_cast(TABLE_LIST*) (cursor->table))->table;
cursor->do_redirect= 0;
}
} }
} }
......
...@@ -157,7 +157,6 @@ typedef struct st_table_list ...@@ -157,7 +157,6 @@ typedef struct st_table_list
uint32 db_length, real_name_length; uint32 db_length, real_name_length;
bool straight; /* optimize with prev table */ bool straight; /* optimize with prev table */
bool updating; /* for replicate-do/ignore table */ bool updating; /* for replicate-do/ignore table */
bool do_redirect; /* To get the struct in UNION's */
bool force_index; /* Prefer index over table scan */ bool force_index; /* Prefer index over table scan */
} TABLE_LIST; } TABLE_LIST;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment