mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Portability fixes
This commit is contained in:
@ -140,7 +140,7 @@ void memorize_variant_topic(THD *thd, TABLE *topics, int count,
|
||||
{
|
||||
if (count == 1)
|
||||
names->push_back(name);
|
||||
String *new_name= new String;
|
||||
String *new_name= new (&thd->mem_root) String;
|
||||
get_field(mem_root,find_fields[help_topic_name].field,new_name);
|
||||
names->push_back(new_name);
|
||||
}
|
||||
@ -391,7 +391,7 @@ int search_categories(THD *thd, TABLE *categories,
|
||||
{
|
||||
if (select && !select->cond->val_int())
|
||||
continue;
|
||||
String *lname= new String;
|
||||
String *lname= new (&thd->mem_root) String;
|
||||
get_field(&thd->mem_root,pfname,lname);
|
||||
if (++count == 1 && res_id)
|
||||
*res_id= (int16) pcat_id->val_int();
|
||||
@ -425,7 +425,7 @@ void get_all_items_for_category(THD *thd, TABLE *items, Field *pfname,
|
||||
{
|
||||
if (!select->cond->val_int())
|
||||
continue;
|
||||
String *name= new String();
|
||||
String *name= new (&thd->mem_root) String();
|
||||
get_field(&thd->mem_root,pfname,name);
|
||||
res->push_back(name);
|
||||
}
|
||||
|
Reference in New Issue
Block a user