summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorhf@deer.(none) <>2005-09-26 14:55:52 +0500
committerhf@deer.(none) <>2005-09-26 14:55:52 +0500
commit836bc2638e1939c0f65748f219e5613cc0f0af06 (patch)
treea7fdb5773c287053a17d940cbbd86da7c2136cde /sql
parent4b24f83f8f2b9646f4a43fd3dc83baa7e88f39c2 (diff)
downloadmariadb-git-836bc2638e1939c0f65748f219e5613cc0f0af06.tar.gz
Fix for bug #12267 (primary key over GEOMETRY field)
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 635b512fe23..d9ed7165850 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1148,7 +1148,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
{
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))
{