diff options
author | Gleb Shchepa <gshchepa@mysql.com> | 2008-09-03 13:06:03 +0500 |
---|---|---|
committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-09-03 13:06:03 +0500 |
commit | 5cee5b9b965f68aed1b81d87f773f74302eb21d7 (patch) | |
tree | 2f93201c239ef1dca8b6ae55de04e918ae4523bf /mysql-test/r/default.result | |
parent | 8b0e99fe26db6c41ae4bdddd31777e1f63638efe (diff) | |
parent | dd1d9adbb087d351ba69e51831dbf4ea628bbf9e (diff) | |
download | mariadb-git-5cee5b9b965f68aed1b81d87f773f74302eb21d7.tar.gz |
merge 5.0 --> 5.1
Diffstat (limited to 'mysql-test/r/default.result')
-rw-r--r-- | mysql-test/r/default.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/default.result b/mysql-test/r/default.result index e65e015eff9..5b0d82407a2 100644 --- a/mysql-test/r/default.result +++ b/mysql-test/r/default.result @@ -205,4 +205,19 @@ Warnings: Warning 1364 Field 'id' doesn't have a default value drop view v1; drop table t1; +create table t1 (a int unique); +create table t2 (b int default 10); +insert into t1 (a) values (1); +insert into t2 (b) values (1); +insert into t1 (a) select b from t2 on duplicate key update a=default; +select * from t1; +a +NULL +insert into t1 (a) values (1); +insert into t1 (a) select b from t2 on duplicate key update a=default(b); +select * from t1; +a +NULL +10 +drop table t1, t2; End of 5.0 tests. |