Fix automerge: s/hash_search/my_hash_search/.

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(&current_thd->user_vars,
+    (user_var_entry*) my_hash_search(&current_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(&current_thd->user_vars,
+    (user_var_entry*) my_hash_search(&current_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(&current_thd->user_vars,
+    (user_var_entry*) my_hash_search(&current_thd->user_vars,
                                   (uchar*) name, strlen(name));
   if (!entry)
     return 1;

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;
 }