mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Update of query cache code.
Changed some sql_alloc() -> thd->alloc() Removed a lot of compiler warnings on Linux Alpha (64 bit) Fixed some core dumps on 64 bit systems (wrong type for packet_len)
This commit is contained in:
@@ -739,9 +739,9 @@ TABLE *delayed_insert::get_local_table(THD* client_thd)
|
||||
}
|
||||
|
||||
client_thd->proc_info="allocating local table";
|
||||
copy= (TABLE*) sql_alloc(sizeof(*copy)+
|
||||
(table->fields+1)*sizeof(Field**)+
|
||||
table->reclength);
|
||||
copy= (TABLE*) client_thd->alloc(sizeof(*copy)+
|
||||
(table->fields+1)*sizeof(Field**)+
|
||||
table->reclength);
|
||||
if (!copy)
|
||||
goto error;
|
||||
*copy= *table;
|
||||
@@ -759,7 +759,7 @@ TABLE *delayed_insert::get_local_table(THD* client_thd)
|
||||
found_next_number_field=table->found_next_number_field;
|
||||
for (org_field=table->field ; *org_field ; org_field++,field++)
|
||||
{
|
||||
if (!(*field= (*org_field)->new_field(copy)))
|
||||
if (!(*field= (*org_field)->new_field(&client_thd->mem_root,copy)))
|
||||
return 0;
|
||||
(*field)->move_field(adjust_ptrs); // Point at copy->record[0]
|
||||
if (*org_field == found_next_number_field)
|
||||
|
||||
Reference in New Issue
Block a user