diff options
| author | unknown <holyfoot@deer.(none)> | 2006-06-27 17:00:24 +0500 |
|---|---|---|
| committer | unknown <holyfoot@deer.(none)> | 2006-06-27 17:00:24 +0500 |
| commit | e832964174c43c6edb5603ab372223c964145a98 (patch) | |
| tree | 7301c190a8deee5833b4ee3b6201a3a994a6036a | |
| parent | 360ae7fe2cb55a00553ab50f957f719900c65f0f (diff) | |
| download | mariadb-git-e832964174c43c6edb5603ab372223c964145a98.tar.gz | |
merging fix
| -rw-r--r-- | mysql-test/r/gis.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 8d1f0bb3937..7a0f689df36 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -693,6 +693,7 @@ create table t1(pt GEOMETRY); alter table t1 add primary key pti(pt); ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length alter table t1 add primary key pti(pt(20)); +drop table t1; create table t1 (g GEOMETRY); select * from t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 566dbf882ad..4c6ff9b2fe7 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -408,6 +408,8 @@ create table t1(pt GEOMETRY); --error 1170 alter table t1 add primary key pti(pt); alter table t1 add primary key pti(pt(20)); +drop table t1; + --enable_metadata create table t1 (g GEOMETRY); select * from t1; |