diff options
| author | ibabaev@bk-internal.mysql.com <> | 2007-02-13 00:00:27 +0100 |
|---|---|---|
| committer | ibabaev@bk-internal.mysql.com <> | 2007-02-13 00:00:27 +0100 |
| commit | 4aab8494e9dab70f7ccd70f3033122580c729ffe (patch) | |
| tree | 1f7162e892e1ded28c67600675779fe80cd762ab /mysql-test | |
| parent | f4ab936ff13fa8bd596529456a4e1f5f37515b26 (diff) | |
| parent | fd95800632df3e8319e09695d33dd982624d7733 (diff) | |
| download | mariadb-git-4aab8494e9dab70f7ccd70f3033122580c729ffe.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/default.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/gis.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/default.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 8 |
4 files changed, 31 insertions, 2 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. diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 8cbc344f062..6483b12acb0 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -718,6 +718,10 @@ desc t1; Field Type Null Key Default Extra GeomFromText('point(1 1)') geometry NO drop table t1; +create table t1 (g geometry not null); +insert into t1 values(default); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +drop table t1; create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); create view v1 as select * from t1; desc v1; diff --git a/mysql-test/t/default.test b/mysql-test/t/default.test index 225ddbc3ee2..14aa4b02cfe 100644 --- a/mysql-test/t/default.test +++ b/mysql-test/t/default.test @@ -137,6 +137,13 @@ insert into bug20691 values (DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAUL select * from bug20691 order by x asc; drop table bug20691; -### +create table t1 (id int not null); +insert into t1 values(default); + +create view v1 (c) as select id from t1; +insert into t1 values(default); +drop view v1; +drop table t1; + --echo End of 5.0 tests. diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index d1ea8dbe18f..51dec7d2b81 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -430,6 +430,14 @@ desc t1; drop table t1; # +# Bug #20691 (DEFAULT over NOT NULL field) +# +create table t1 (g geometry not null); +--error ER_CANT_CREATE_GEOMETRY_OBJECT +insert into t1 values(default); +drop table t1; + +# # Bug #11335 View redefines column types # create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime); |