mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7

Browse source 
Fixed conflicts in:

- binlog.binlog_unsafe
- rpl.rpl_slow_query_log
This commit is contained in:
Alfranio Correia 2009-12-17 00:09:52 +00:00
commit 9a51ad2c54
234 changed files with 5898 additions and 1586 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/repl_failsafe.cc
View file

@ -558,7 +558,12 @@ HOSTS";
goto err;
}
si->server_id = log_server_id;
my_hash_insert(&slave_list, (uchar*)si);
if (my_hash_insert(&slave_list, (uchar*)si))
{
error= "the slave is out of memory";
pthread_mutex_unlock(&LOCK_slave_list);
goto err;
}
}
strmake(si->host, row[1], sizeof(si->host)-1);
si->port = atoi(row[port_ind]);