diff options
author | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
---|---|---|
committer | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
commit | 443b16861bf50b1f26d8933d52d2485da1483b09 (patch) | |
tree | b00d3f9ec6d7680497c677594748cd528a256962 /sql/table.cc | |
parent | d8972f1e8ce6de590ade2cb540d1bd973b7959c0 (diff) | |
parent | 58263844c7e916d271dc1e14661ea1b6e66d5e04 (diff) | |
download | mariadb-git-443b16861bf50b1f26d8933d52d2485da1483b09.tar.gz |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-13410
sql/item.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1b3a6173752..190813ecfb6 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2426,22 +2426,6 @@ Field *Natural_join_column::field() const char *Natural_join_column::table_name() { return table_ref->alias; - /* - TODO: - I think that it is sufficient to return just - table->alias, which is correctly set to either - the view name, the table name, or the alias to - the table reference (view or stored table). - */ -#ifdef NOT_YET - if (view_field) - return table_ref->view_name.str; - - DBUG_ASSERT(!strcmp(table_ref->table_name, - table_ref->table->s->table_name)); - return table_ref->table_name; -} -#endif } @@ -2577,7 +2561,7 @@ Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref, DBUG_RETURN(field); } Item *item= new Item_direct_view_ref(&view->view->select_lex.context, - field_ref, view->view_name.str, + field_ref, view->alias, name); DBUG_RETURN(item); } |