summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2005-01-27 11:06:44 +0300
committergluh@gluh.mysql.r18.ru <>2005-01-27 11:06:44 +0300
commitefeeb3c2e65046cf9dca3bb144d829e124dccb29 (patch)
treebac08c3d1788fc9a94b28b7d569d8221fe0f1ffc /sql/sql_show.cc
parenta6315a8ad92912c6451340a5021c246d536f73e1 (diff)
downloadmariadb-git-efeeb3c2e65046cf9dca3bb144d829e124dccb29.tar.gz
Fix after review for
ChangeSet 1.1803 05/01/24 Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc14
1 files changed, 0 insertions, 14 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b805ab9ac27..fe333b233e0 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3207,22 +3207,10 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list)
{
if (!transl->item->fixed &&
transl->item->fix_fields(thd, table_list, &transl->item))
- {
DBUG_RETURN(1);
- }
- }
- if (sel->where && !sel->where->fixed &&
- sel->where->fix_fields(thd, table_list, &sel->where))
- {
- DBUG_RETURN(1);
- }
- for (transl= table_list->field_translation; transl < end; transl++)
- {
- transl->item->rename((char *)transl->name);
}
DBUG_RETURN(0);
}
-
List_iterator_fast<Item> it(sel->item_list);
if (!(transl=
(Field_translator*)(thd->current_arena->
@@ -3236,9 +3224,7 @@ int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list)
char *name= item->name;
transl[i].item= item;
if (!item->fixed && item->fix_fields(thd, table_list, &transl[i].item))
- {
DBUG_RETURN(1);
- }
transl[i++].name= name;
}
table_list->field_translation= transl;