diff options
| author | unknown <hf@deer.(none)> | 2005-10-15 21:05:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-10-15 21:05:29 +0500 |
| commit | 56d85e2a03cfaa50939f8c5167f996b2a498770e (patch) | |
| tree | f9d2e311869733fa5995fbe6a57b41fe3b6966e7 /mysql-test | |
| parent | 11541107b83d8e361722dff601192bd7d7f70ca9 (diff) | |
| parent | 2616b6578703e0650510cee72d821cbe1a80efed (diff) | |
| download | mariadb-git-56d85e2a03cfaa50939f8c5167f996b2a498770e.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/gis.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 78014137b50..2748199efad 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -680,3 +680,8 @@ select astext(fn3()); astext(fn3()) POINT(1 1) drop function fn3; +create table t1(pt POINT); +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; diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index aba2f33833a..1f30407c2b7 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -395,3 +395,11 @@ show create function fn3; select astext(fn3()); drop function fn3; +# +# Bug #12267 (primary key over GIS) +# +create table t1(pt POINT); +--error 1170 +alter table t1 add primary key pti(pt); +alter table t1 add primary key pti(pt(20)); +drop table t1; |