diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-10-23 11:44:14 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-10-23 11:44:14 +0300 |
| commit | 3553f6eac20bd08d2bbf40f49c8830c580681acc (patch) | |
| tree | b06c9ed11a905264c96930def5aab8cf1965e43d /sql/table.cc | |
| parent | ffea2073b10ee86cbd7b037053e520145803afc6 (diff) | |
| parent | d066e2173c814a373503b598ffc787094c914775 (diff) | |
| download | mariadb-git-3553f6eac20bd08d2bbf40f49c8830c580681acc.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index c1d8e3abe94..a212751db8d 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1351,9 +1351,11 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, keyinfo->key_length+= HA_KEY_NULL_LENGTH; } if (field->type() == MYSQL_TYPE_BLOB || - field->real_type() == MYSQL_TYPE_VARCHAR) + field->real_type() == MYSQL_TYPE_VARCHAR || + field->type() == MYSQL_TYPE_GEOMETRY) { - if (field->type() == MYSQL_TYPE_BLOB) + if (field->type() == MYSQL_TYPE_BLOB || + field->type() == MYSQL_TYPE_GEOMETRY) key_part->key_part_flag|= HA_BLOB_PART; else key_part->key_part_flag|= HA_VAR_LENGTH_PART; |