mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Portability fixes
mysql-test/r/show_check.result: Updated results mysql-test/t/show_check.test: Portability fix (for 64 bit platforms) mysys/hash.c: Portablity fix sql/gen_lex_hash.cc: Don't include mysql_priv.h; Causes build errors on a lot of platforms sql/lex_symbol.h: Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc sql/mysql_priv.h: Move symbols and struct to lex_symbol.h sql/sql_db.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_help.cc: Don't use sql_alloc/sql_free methods in sql_string.h sql/sql_string.h: Don't use sql_alloc/sql_free methods in sql_string.h This makes the code faster and more portable sql/sql_yacc.yy: Don't use sql_alloc/sql_free methods in sql_string.h
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