database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed LP bug #707555.

Browse Source 
The bug was in the code of the patch fixing bug 698882.
With improper casting the method store_key_field::change_source_field
was called for the elements of the array TABLE_REF::key_copy that
were either of a different type or not allocated at all. This caused
crashes in some queries.
This commit is contained in:
Igor Babaev
2011-01-26 11:30:29 -08:00
parent 1f970d41e8
commit a624f99e98
6 changed files with 179 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.h
View File

@ -997,6 +997,7 @@ class store_key :public Sql_alloc
public:
bool null_key; /* TRUE <=> the value of the key has a null part */
enum store_key_result { STORE_KEY_OK, STORE_KEY_FATAL, STORE_KEY_CONV };
enum Type { FIELD_STORE_KEY, ITEM_STORE_KEY, CONST_ITEM_STORE_KEY };
store_key(THD *thd, Field *field_arg, uchar *ptr, uchar *null, uint length)
:null_key(0), null_ptr(null), err(0)
{
@ -1017,6 +1018,7 @@ public:
ptr, null, 1);
}
virtual ~store_key() {} /** Not actually needed */
virtual enum Type type() const=0;
virtual const char *name() const=0;
/**
@ -1068,7 +1070,9 @@ class store_key_field: public store_key
{
copy_field.set(to_field,from_field,0);
}
}
}
enum Type type() const { return FIELD_STORE_KEY; }
const char *name() const { return field_name; }
void change_source_field(Item_field *fld_item)
@ -1116,6 +1120,8 @@ public:
null_ptr_arg ? null_ptr_arg : item_arg->maybe_null ?
&err : (uchar*) 0, length), item(item_arg), use_value(val)
{}
enum Type type() const { return ITEM_STORE_KEY; }
const char *name() const { return "func"; }
protected:
@ -1164,6 +1170,8 @@ public:
&err : (uchar*) 0, length, item_arg, FALSE), inited(0)
{
}
enum Type type() const { return CONST_ITEM_STORE_KEY; }
const char *name() const { return "const"; }
protected: