Commit 7e8c3865 authored by unknown's avatar unknown
Browse files

fixed difference between ps-protocol and usual execution 


mysql-test/r/view.result:
  removed wrong warning
sql/sql_view.cc:
  fix_fields have to be (and will be) made later
parent c75eae35

mysql-test/r/view.result

+0 −2
Original line number Diff line number Diff line
@@ -754,8 +754,6 @@ create view v1 as select * from t1; 
create view v2 as select * from t2;

insert into v1 values (1);

insert into v2 values (1);

Warnings:

Warning	1423	Field of view 'test.v2' underlying table doesn't have a default value

create view v3 (a,b) as select v1.col1 as a, v2.col1 as b from v1, v2 where v1.col1 = v2.col1;

select * from v3;

a	b

sql/sql_view.cc

+0 −2
Original line number Diff line number Diff line
@@ -1198,8 +1198,6 @@ bool insert_view_fields(THD *thd, List<Item> *list, TABLE_LIST *view) 
  for (Field_translator *entry= trans; entry < trans_end; entry++)

  {

    Item_field *fld;

    if (!entry->item->fixed && entry->item->fix_fields(thd, &entry->item))

      DBUG_RETURN(TRUE);

    if ((fld= entry->item->filed_for_view_update()))

      list->push_back(fld);

    else