1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix automerge: s/hash_search/my_hash_search/.

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-10-28 11:42:18 +03:00
parent ac7ba1bcaa
commit 800ba382d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_handler.cc
View File

@ -44,7 +44,7 @@ int get_user_var_int(const char *name,
{ {
my_bool null_val; my_bool null_val;
user_var_entry *entry= user_var_entry *entry=
(user_var_entry*) hash_search(&current_thd->user_vars, (user_var_entry*) my_hash_search(&current_thd->user_vars,
(uchar*) name, strlen(name)); (uchar*) name, strlen(name));
if (!entry) if (!entry)
return 1; return 1;
@ -59,7 +59,7 @@ int get_user_var_real(const char *name,
{ {
my_bool null_val; my_bool null_val;
user_var_entry *entry= user_var_entry *entry=
(user_var_entry*) hash_search(&current_thd->user_vars, (user_var_entry*) my_hash_search(&current_thd->user_vars,
(uchar*) name, strlen(name)); (uchar*) name, strlen(name));
if (!entry) if (!entry)
return 1; return 1;
@ -75,7 +75,7 @@ int get_user_var_str(const char *name, char *value,
String str; String str;
my_bool null_val; my_bool null_val;
user_var_entry *entry= user_var_entry *entry=
(user_var_entry*) hash_search(&current_thd->user_vars, (user_var_entry*) my_hash_search(&current_thd->user_vars,
(uchar*) name, strlen(name)); (uchar*) name, strlen(name));
if (!entry) if (!entry)
return 1; return 1;

2
sql/sql_repl.cc
View File

@ -377,7 +377,7 @@ static ulonglong get_heartbeat_period(THD * thd)
my_bool null_value; my_bool null_value;
LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")}; LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")};
user_var_entry *entry= user_var_entry *entry=
(user_var_entry*) hash_search(&thd->user_vars, (uchar*) name.str, (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str,
name.length); name.length);
return entry? entry->val_int(&null_value) : 0; return entry? entry->val_int(&null_value) : 0;
} }