database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Portability fixes for windows

Browse Source 
After merge fixes


include/my_base.h:
  Fix comment syntax
libmysql/client_settings.h:
  Portability fixes for windows
libmysql/libmysql.c:
  Portability fixes for windows
libmysql/libmysql.def:
  Portability fixes for windows
mysql-test/r/variables.result:
  Fix result after merge
sql-common/client.c:
  Portability fixes for windows
sql/ha_berkeley.cc:
  Use defines instead of constants
sql/item_strfunc.cc:
  Portability fixes for windows
sql/mysql_priv.h:
  Use defines instead of defines
sql/mysqld.cc:
  After merge fix
sql/opt_range.h:
  After merge fix
sql/set_var.h:
  Portability fixes for windows
sql/sql_class.cc:
  Defines instead of constants
sql/sql_help.cc:
  after merge fixes
  More OOM error checking
sql/sql_prepare.cc:
  After merge fixes
sql/sql_table.cc:
  Portability fixes for windows
This commit is contained in:
unknown
2003-10-15 22:40:36 +03:00
parent 086ec556f8
commit ddbc842854
16 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.cc
View File

@@ -148,7 +148,7 @@ THD::THD():user_time(0), is_fatal_error(0),
bzero((char*) &transaction.mem_root,sizeof(transaction.mem_root));
bzero((char*) &con_root,sizeof(con_root));
bzero((char*) &warn_root,sizeof(warn_root));
init_alloc_root(&warn_root, 1024, 0);
init_alloc_root(&warn_root, WARN_ALLOC_BLOCK_SIZE, WARN_ALLOC_PREALLOC_SIZE);
user_connect=(USER_CONN *)0;
hash_init(&user_vars, &my_charset_bin, USER_VARS_HASH_SIZE, 0, 0,
(hash_get_key) get_var_key,
@@ -230,9 +230,11 @@ void THD::init(void)
void THD::init_for_queries()
{
init_sql_alloc(&mem_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC);
init_sql_alloc(&mem_root, variables.query_alloc_block_size,
variables.query_prealloc_size);
init_sql_alloc(&transaction.mem_root,
TRANS_MEM_ROOT_BLOCK_SIZE, TRANS_MEM_ROOT_PREALLOC);
variables.trans_alloc_block_size,
variables.trans_prealloc_size);
}