database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


mysql-test/r/view.result:
  Auto merged
This commit is contained in:
unknown
2007-05-30 17:09:16 +05:00
parent 6e330800a8 11b084102d
commit 7d944077fa
19 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1497,7 +1497,7 @@ insert into v3(b) values (10);
insert into v3(a) select a from t2;
insert into v3(b) select b from t2;
Warnings:
Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2
Warning 1048 Column 'a' cannot be null
insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a);
select * from t1;
a b