Commit 61e96be7 authored by unknown's avatar unknown

postmerge fix

parent 75730fb3
...@@ -1424,7 +1424,6 @@ a ...@@ -1424,7 +1424,6 @@ a
1 1
drop view v1; drop view v1;
drop table t1; drop table t1;
drop table t1,t2;
create table t1 (a int); create table t1 (a int);
create table t2 (a int); create table t2 (a int);
create table t3 (a int); create table t3 (a int);
...@@ -1541,7 +1540,7 @@ insert into v3(b) values (10); ...@@ -1541,7 +1540,7 @@ insert into v3(b) values (10);
insert into v3(a) select a from t2; insert into v3(a) select a from t2;
insert into v3(b) select b from t2; insert into v3(b) select b from t2;
Warnings: Warnings:
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 2 Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a); insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a);
select * from t1; select * from t1;
a b a b
......
...@@ -1387,7 +1387,6 @@ insert ignore into v1 values (1) on duplicate key update a=2; ...@@ -1387,7 +1387,6 @@ insert ignore into v1 values (1) on duplicate key update a=2;
select * from t1; select * from t1;
drop view v1; drop view v1;
drop table t1; drop table t1;
drop table t1,t2;
# #
# merge of VIEW with several tables # merge of VIEW with several tables
......
...@@ -567,7 +567,11 @@ static bool check_view_insertability(TABLE_LIST *view, ulong query_id) ...@@ -567,7 +567,11 @@ static bool check_view_insertability(TABLE_LIST *view, ulong query_id)
view->contain_auto_increment= 1; view->contain_auto_increment= 1;
/* prepare unique test */ /* prepare unique test */
field->field->query_id= other_query_id; field->field->query_id= other_query_id;
*trans= field; // remove collation if we have it /*
remove collation (or other transparent for update function) if we have
it
*/
trans->item= field;
} }
/* unique test */ /* unique test */
for (trans= trans_start; trans != trans_end; trans++) for (trans= trans_start; trans != trans_end; trans++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment