diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
| commit | d30e1c76ae94134bebae247d409c3695612f60cd (patch) | |
| tree | a59eeda9c7029dbe5cbace146d40ed7408151567 /mysql-test/r/default.result | |
| parent | c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 (diff) | |
| parent | 07f36668aecfd3d811c4ed5eb23b1bfdb8c86fdd (diff) | |
| download | mariadb-git-d30e1c76ae94134bebae247d409c3695612f60cd.tar.gz | |
Merge mysql.com:/home/hf/work/20691/my50-20691
into mysql.com:/home/hf/work/20691/my51-20691
mysql-test/r/default.result:
Auto merged
sql/item.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
merging
Diffstat (limited to 'mysql-test/r/default.result')
| -rw-r--r-- | mysql-test/r/default.result | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/r/default.result b/mysql-test/r/default.result index 9bef2e2fdbf..cf9ef4f8f8b 100644 --- a/mysql-test/r/default.result +++ b/mysql-test/r/default.result @@ -193,6 +193,16 @@ a b c d e f g h i x two large 00:00:05 0007-01-01 11 13 17 0019-01-01 00:00:00 23 1 small 00:00:00 0000-00-00 0 0000-00-00 00:00:00 0 2 two large 00:00:05 0007-01-01 11 13 17 0019-01-01 00:00:00 23 3 - small 00:00:00 0000-00-00 0 0000-00-00 00:00:00 0 4 + 00:00:00 0000-00-00 0 0000-00-00 00:00:00 0 4 drop table bug20691; +create table t1 (id int not null); +insert into t1 values(default); +Warnings: +Warning 1364 Field 'id' doesn't have a default value +create view v1 (c) as select id from t1; +insert into t1 values(default); +Warnings: +Warning 1364 Field 'id' doesn't have a default value +drop view v1; +drop table t1; End of 5.0 tests. |