Skip to content

Commit 800ba38

Browse files
author
Alexander Nozdrin
committed
Fix automerge: s/hash_search/my_hash_search/.
1 parent ac7ba1b commit 800ba38

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sql/rpl_handler.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int get_user_var_int(const char *name,
4444
{
4545
my_bool null_val;
4646
user_var_entry *entry=
47-
(user_var_entry*) hash_search(&current_thd->user_vars,
47+
(user_var_entry*) my_hash_search(&current_thd->user_vars,
4848
(uchar*) name, strlen(name));
4949
if (!entry)
5050
return 1;
@@ -59,7 +59,7 @@ int get_user_var_real(const char *name,
5959
{
6060
my_bool null_val;
6161
user_var_entry *entry=
62-
(user_var_entry*) hash_search(&current_thd->user_vars,
62+
(user_var_entry*) my_hash_search(&current_thd->user_vars,
6363
(uchar*) name, strlen(name));
6464
if (!entry)
6565
return 1;
@@ -75,7 +75,7 @@ int get_user_var_str(const char *name, char *value,
7575
String str;
7676
my_bool null_val;
7777
user_var_entry *entry=
78-
(user_var_entry*) hash_search(&current_thd->user_vars,
78+
(user_var_entry*) my_hash_search(&current_thd->user_vars,
7979
(uchar*) name, strlen(name));
8080
if (!entry)
8181
return 1;

sql/sql_repl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ static ulonglong get_heartbeat_period(THD * thd)
377377
my_bool null_value;
378378
LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")};
379379
user_var_entry *entry=
380-
(user_var_entry*) hash_search(&thd->user_vars, (uchar*) name.str,
380+
(user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str,
381381
name.length);
382382
return entry? entry->val_int(&null_value) : 0;
383383
}

0 commit comments

Comments
 (0)