diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-16 15:34:11 +0100 |
| commit | 2ff2d1873a989e1c7f304f64c57ff236d7c48750 (patch) | |
| tree | 6ef380be281adedf087a0aeebda5286409211a25 /sql/repl_failsafe.cc | |
| parent | f31b16543a7b0f1c07ecb54113df5b70ceef6550 (diff) | |
| parent | b3d99069077cd24e1cf4bb07857fdb12aee895a0 (diff) | |
| download | mariadb-git-2ff2d1873a989e1c7f304f64c57ff236d7c48750.tar.gz | |
merge
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index e3893ce2500..8392b2c1c3d 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -559,7 +559,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]); |