diff options
| author | unknown <igor@rurik.mysql.com> | 2006-09-09 10:23:13 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-09-09 10:23:13 -0700 |
| commit | 5371adca31dab5c2b8268a74181b50b430873d88 (patch) | |
| tree | cff07cdc6ab8ce0e992cfa1ddf26234391ee6634 /sql/sql_select.cc | |
| parent | a65342f38daf35199c21f366fe9ada98a11f4de9 (diff) | |
| parent | 22c3e7b4e19be5b18026c905d886c4f7428c7dd6 (diff) | |
| download | mariadb-git-5371adca31dab5c2b8268a74181b50b430873d88.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug5500
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8ba11195c87..93d923f0669 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14391,9 +14391,12 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, item_list.push_back(new Item_string(table_name_buffer, len, cs)); } else - item_list.push_back(new Item_string(table->alias, - strlen(table->alias), + { + TABLE_LIST *tab=table->pos_in_table_list; + item_list.push_back(new Item_string(tab->alias, + strlen(tab->alias), cs)); + } /* type */ item_list.push_back(new Item_string(join_type_str[tab->type], strlen(join_type_str[tab->type]), @@ -14580,8 +14583,8 @@ bool mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, select_result *result) // drop UNCACHEABLE_EXPLAIN, because it is for internal usage only uint8 uncacheable= (sl->uncacheable & ~UNCACHEABLE_EXPLAIN); sl->type= (((&thd->lex->select_lex)==sl)? - ((thd->lex->all_selects_list != sl) ? - primary_key_name : "SIMPLE"): + (sl->first_inner_unit() || sl->next_select() ? + "PRIMARY" : "SIMPLE"): ((sl == first)? ((sl->linkage == DERIVED_TABLE_TYPE) ? "DERIVED": |