summaryrefslogtreecommitdiff
path: root/sql/repl_failsafe.cc
diff options
context:
space:
mode:
authorhf@deer.(none) <>2003-09-19 14:44:31 +0500
committerhf@deer.(none) <>2003-09-19 14:44:31 +0500
commita2dbfaefa366792fd1ed7e0a331212997fe43ceb (patch)
tree3c07a62a6ce161b611b85e52602cd8585ba0ad6d /sql/repl_failsafe.cc
parent0868446b3e457e1ce32f63cadff4ef4c8b17344a (diff)
downloadmariadb-git-a2dbfaefa366792fd1ed7e0a331212997fe43ceb.tar.gz
SCRUM
embedded library hash_insert renamed to my_hash_insert to avoid name intersection with another libraries is there better idea?
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r--sql/repl_failsafe.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 5e040d26dc3..b931ce0ba8c 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -177,7 +177,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length)
pthread_mutex_lock(&LOCK_slave_list);
unregister_slave(thd,0,0);
- res= hash_insert(&slave_list, (byte*) si);
+ res= my_hash_insert(&slave_list, (byte*) si);
pthread_mutex_unlock(&LOCK_slave_list);
return res;
@@ -540,7 +540,7 @@ HOSTS";
goto err;
}
si->server_id = server_id;
- hash_insert(&slave_list, (byte*)si);
+ my_hash_insert(&slave_list, (byte*)si);
}
strmake(si->host, row[1], sizeof(si->host)-1);
si->port = atoi(row[port_ind]);