database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0

Browse Source 
into deer.(none):/home/hf/work/mysql-5.0.12267
This commit is contained in:
hf@deer.(none)
2005-10-15 21:05:29 +05:00
parent a5c5b2c658 836bc2638e
commit 7fb1ffd07e
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/gis.result
View File

@ -680,3 +680,8 @@ select astext(fn3());
astext(fn3()) astext(fn3())
POINT(1 1) POINT(1 1)
drop function fn3; 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;

8
mysql-test/t/gis.test
View File

@ -395,3 +395,11 @@ show create function fn3;
select astext(fn3()); select astext(fn3());
drop function 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;

3
sql/sql_table.cc
View File

@ -1148,7 +1148,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
{ {
column->length*= sql_field->charset->mbmaxlen; column->length*= sql_field->charset->mbmaxlen;
if (f_is_blob(sql_field->pack_flag)) if (f_is_blob(sql_field->pack_flag) ||
(f_is_geom(sql_field->pack_flag) && key->type != Key::SPATIAL))
{ {
if (!(file->table_flags() & HA_CAN_INDEX_BLOBS)) if (!(file->table_flags() & HA_CAN_INDEX_BLOBS))
{ {