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/sql_select.h | |
| 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/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index efa92432e2b..256d57cc10a 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -566,9 +566,13 @@ public: store_key(THD *thd, Field *field_arg, uchar *ptr, uchar *null, uint length) :null_key(0), null_ptr(null), err(0) { - if (field_arg->type() == MYSQL_TYPE_BLOB) + if (field_arg->type() == MYSQL_TYPE_BLOB + || field_arg->type() == MYSQL_TYPE_GEOMETRY) { - /* Key segments are always packed with a 2 byte length prefix */ + /* + Key segments are always packed with a 2 byte length prefix. + See mi_rkey for details. + */ to_field= new Field_varstring(ptr, length, 2, null, 1, Field::NONE, field_arg->field_name, field_arg->table->s, field_arg->charset()); |