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:
@ -69,12 +69,10 @@ public:
|
||||
Alloced_length=str.Alloced_length; alloced=0;
|
||||
str_charset=str.str_charset;
|
||||
}
|
||||
static void *operator new(size_t size)
|
||||
{ return (void*) sql_alloc((uint) size); }
|
||||
static void *operator new(size_t size, MEM_ROOT *mem_root)
|
||||
{ return (void*) alloc_root(mem_root, (uint) size); }
|
||||
static void operator delete(void *ptr_arg,size_t size) /*lint -e715 */
|
||||
{ sql_element_free(ptr_arg); }
|
||||
{}
|
||||
~String() { free(); }
|
||||
|
||||
inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
|
||||
|
Reference in New Issue
Block a user