1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug #251 - destroyed object reused - fixed

Browse Source
This commit is contained in:
serg@serg.mylan 2003-06-13 23:00:04 +02:00
parent 041b0819c2
commit 002d842012
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/field.h
View File

@ -50,7 +50,7 @@ public:
LEX_STRING comment; LEX_STRING comment;
ulong query_id; // For quick test of used fields ulong query_id; // For quick test of used fields
/* Field is part of the following keys */ /* Field is part of the following keys */
key_map key_start,part_of_key,part_of_sortkey; key_map key_start,part_of_key,part_of_sortkey;
enum utype { NONE,DATE,SHIELD,NOEMPTY,CASEUP,PNR,BGNR,PGNR,YES,NO,REL, enum utype { NONE,DATE,SHIELD,NOEMPTY,CASEUP,PNR,BGNR,PGNR,YES,NO,REL,
CHECK,EMPTY,UNKNOWN_FIELD,CASEDN,NEXT_NUMBER,INTERVAL_FIELD, CHECK,EMPTY,UNKNOWN_FIELD,CASEDN,NEXT_NUMBER,INTERVAL_FIELD,
BIT_FIELD, TIMESTAMP_FIELD,CAPITALIZE,BLOB_FIELD}; BIT_FIELD, TIMESTAMP_FIELD,CAPITALIZE,BLOB_FIELD};
@ -134,6 +134,7 @@ public:
virtual void sort_string(char *buff,uint length)=0; virtual void sort_string(char *buff,uint length)=0;
virtual bool optimize_range(uint idx); virtual bool optimize_range(uint idx);
virtual bool store_for_compare() { return 0; } virtual bool store_for_compare() { return 0; }
virtual void free() {}
Field *new_field(MEM_ROOT *root, struct st_table *new_table) Field *new_field(MEM_ROOT *root, struct st_table *new_table)
{ {
Field *tmp= (Field*) memdup_root(root,(char*) this,size_of()); Field *tmp= (Field*) memdup_root(root,(char*) this,size_of());
@ -937,7 +938,7 @@ public:
int pack_cmp(const char *b, uint key_length); int pack_cmp(const char *b, uint key_length);
uint packed_col_length(const char *col_ptr, uint length); uint packed_col_length(const char *col_ptr, uint length);
uint max_packed_col_length(uint max_length); uint max_packed_col_length(uint max_length);
inline void free() { value.free(); } void free() { value.free(); }
inline void clear_temporary() { bzero((char*) &value,sizeof(value)); } inline void clear_temporary() { bzero((char*) &value,sizeof(value)); }
friend void field_conv(Field *to,Field *from); friend void field_conv(Field *to,Field *from);
uint size_of() const { return sizeof(*this); } uint size_of() const { return sizeof(*this); }

2
sql/sql_select.cc
View File

@ -4791,7 +4791,7 @@ free_tmp_table(THD *thd, TABLE *entry)
(void) ha_delete_table(entry->db_type,entry->real_name); (void) ha_delete_table(entry->db_type,entry->real_name);
/* free blobs */ /* free blobs */
for (Field **ptr=entry->field ; *ptr ; ptr++) for (Field **ptr=entry->field ; *ptr ; ptr++)
delete *ptr; (*ptr)->free();
my_free((gptr) entry->record[0],MYF(0)); my_free((gptr) entry->record[0],MYF(0));
free_io_cache(entry); free_io_cache(entry);