database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-10-23 11:44:14 +03:00
parent ffea2073b1 d066e2173c
commit 3553f6eac2
12 changed files with 140 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.h
View File

@@ -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());