diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 11:42:18 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 11:42:18 +0300 |
| commit | 42cdc4df8f4a2ed375d935d7d3dd8a877fa9e007 (patch) | |
| tree | 05a0f931f0d6d61cf18b1c0c64d7676791049c45 /sql | |
| parent | 22fe8e10e297c40bc88104fb6a13e5183238850e (diff) | |
| download | mariadb-git-42cdc4df8f4a2ed375d935d7d3dd8a877fa9e007.tar.gz | |
Fix automerge: s/hash_search/my_hash_search/.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/rpl_handler.cc | 6 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index da7aade5b99..b8b82bc2f98 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -44,7 +44,7 @@ int get_user_var_int(const char *name, { my_bool null_val; user_var_entry *entry= - (user_var_entry*) hash_search(¤t_thd->user_vars, + (user_var_entry*) my_hash_search(¤t_thd->user_vars, (uchar*) name, strlen(name)); if (!entry) return 1; @@ -59,7 +59,7 @@ int get_user_var_real(const char *name, { my_bool null_val; user_var_entry *entry= - (user_var_entry*) hash_search(¤t_thd->user_vars, + (user_var_entry*) my_hash_search(¤t_thd->user_vars, (uchar*) name, strlen(name)); if (!entry) return 1; @@ -75,7 +75,7 @@ int get_user_var_str(const char *name, char *value, String str; my_bool null_val; user_var_entry *entry= - (user_var_entry*) hash_search(¤t_thd->user_vars, + (user_var_entry*) my_hash_search(¤t_thd->user_vars, (uchar*) name, strlen(name)); if (!entry) return 1; diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index ba4461d553a..e7c99b6399a 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -377,7 +377,7 @@ static ulonglong get_heartbeat_period(THD * thd) my_bool null_value; LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")}; 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); return entry? entry->val_int(&null_value) : 0; } |