diff options
| author | lenz@mysql.com <> | 2003-02-19 14:58:44 +0100 |
|---|---|---|
| committer | lenz@mysql.com <> | 2003-02-19 14:58:44 +0100 |
| commit | 7a6d8edfd7ebe6ac82a531009fdb5086a0237790 (patch) | |
| tree | 89fd91a2f02bd43a041b8087ebd24cb77befeae1 /sql | |
| parent | 64b204891420fdb754cd77ca7c5a57fcc337d63a (diff) | |
| download | mariadb-git-7a6d8edfd7ebe6ac82a531009fdb5086a0237790.tar.gz | |
Applying Sinisa's patch:
"Cleaning the code of the remaining OLAP code.
This code is unnecessary in 4.1/5.0"
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 1 | ||||
| -rw-r--r-- | sql/sql_union.cc | 6 | ||||
| -rw-r--r-- | sql/table.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 6249c769015..66f11f3da9f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3338,7 +3338,6 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result) for (; aux; aux=next) { TABLE_LIST *cursor; - aux->do_redirect=true; next= aux->next; for (cursor= *result; cursor; cursor=cursor->next) if (!strcmp(cursor->db,aux->db) && diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 4e36ccafefc..faa106d4f42 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -50,11 +50,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) cursor; cursor=cursor->next) { - if (cursor->do_redirect) // False if CUBE/ROLLUP - { - cursor->table= (my_reinterpret_cast(TABLE_LIST*) (cursor->table))->table; - cursor->do_redirect= 0; - } + cursor->table= (my_reinterpret_cast(TABLE_LIST*) (cursor->table))->table; } } diff --git a/sql/table.h b/sql/table.h index c3f469115b5..b6935ea6a32 100644 --- a/sql/table.h +++ b/sql/table.h @@ -157,7 +157,6 @@ typedef struct st_table_list uint32 db_length, real_name_length; bool straight; /* optimize with prev 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 */ } TABLE_LIST; |