diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
| commit | 5d407d0c1aa8a7cb5f18a5a26cb517f8b4eb84fa (patch) | |
| tree | 772f4ae43ad7ce905f024b77bebdd1897d813391 /sql/table.cc | |
| parent | daf7f211cd9662ece946544a8dff2b880edfdf82 (diff) | |
| parent | ad6e00e3b2b9bf26805c90cbd7655c6d2b20cab4 (diff) | |
| download | mariadb-git-5d407d0c1aa8a7cb5f18a5a26cb517f8b4eb84fa.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 5397e03add2..6bd7e7bd59f 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4028,9 +4028,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->alias, - name); + Item *item= new Item_direct_view_ref(view, field_ref, name); DBUG_RETURN(item); } |