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 /sql/sql_table.cc | |
| 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 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9c3ea710dfc..922f04be25a 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)) { |