diff options
| author | kaa@polly.local <> | 2006-12-14 20:58:07 +0300 |
|---|---|---|
| committer | kaa@polly.local <> | 2006-12-14 20:58:07 +0300 |
| commit | 4162e009cb2fc4dc72f35c15bda34768bfaf2807 (patch) | |
| tree | ead3becc168cb944b0829362acb6113451102675 /include | |
| parent | eb9dfafa6527e4e29c400683ba20d03bcd9d9cf8 (diff) | |
| download | mariadb-git-4162e009cb2fc4dc72f35c15bda34768bfaf2807.tar.gz | |
Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.
Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
Diffstat (limited to 'include')
| -rw-r--r-- | include/typelib.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/typelib.h b/include/typelib.h index 4d6a90ad51e..fe19f1001d4 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -18,6 +18,8 @@ #ifndef _typelib_h #define _typelib_h +#include "my_alloc.h" + typedef struct st_typelib { /* Different types saved here */ unsigned int count; /* How many types */ const char *name; /* Name of typelib */ @@ -28,6 +30,7 @@ typedef struct st_typelib { /* Different types saved here */ extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); extern const char *get_type(TYPELIB *typelib,unsigned int nr); +extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from); extern TYPELIB sql_protocol_typelib; |