1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

postmerge fix

Browse Source
This commit is contained in:
bell@sanja.is.com.ua 2004-10-05 15:07:31 +03:00
parent a78f817d20
commit 05acd51fba
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/view.result
View File

@ -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);
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

1
mysql-test/t/view.test
View File

@ -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

6
sql/sql_insert.cc
View File

@ -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++)