database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-5.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/LEX_PTR/mysql-5.0
This commit is contained in:
vva@eagle.mysql.r18.ru
2003-05-14 19:48:58 -04:00
parent afd581edd3 05c78eec38
commit 384b10e2af
10 changed files with 156 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -152,9 +152,9 @@ THD::THD():user_time(0), is_fatal_error(0),
bzero((char*) &warn_root,sizeof(warn_root));
init_alloc_root(&warn_root, 1024, 0);
user_connect=(USER_CONN *)0;
hash_init(&user_vars, &my_charset_bin, USER_VARS_HASH_SIZE, 0, 0,
hash_init(&user_vars, system_charset_info, USER_VARS_HASH_SIZE, 0, 0,
(hash_get_key) get_var_key,
(hash_free_key) free_user_var,0);
(hash_free_key) free_user_var, 0);
/* For user vars replication*/
if (opt_bin_log)
@ -258,7 +258,7 @@ void THD::change_user(void)
cleanup();
cleanup_done= 0;
init();
hash_init(&user_vars, &my_charset_bin, USER_VARS_HASH_SIZE, 0, 0,
hash_init(&user_vars, system_charset_info, USER_VARS_HASH_SIZE, 0, 0,
(hash_get_key) get_var_key,
(hash_free_key) free_user_var, 0);
}