summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <nick@nick.leippe.com>2002-05-31 16:56:02 -0700
committerunknown <nick@nick.leippe.com>2002-05-31 16:56:02 -0700
commit169a4d9282b6186dd41419ba396b2aaaf4d04a2b (patch)
tree79f38d8815c7f9b5ed1b1e35005e13c7eab2ed24 /sql
parent940ab3e0317ff8ebe0fc791ab83a1718481eabd0 (diff)
downloadmariadb-git-169a4d9282b6186dd41419ba396b2aaaf4d04a2b.tar.gz
fixed 'load table from master' hang when host is empty
added respective test case sql/slave.cc: fixed load table from master hang when host is empty
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 946cf483e4b..c7a048e8452 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -451,6 +451,12 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi)
goto err;
}
+ if (!mi->host || !*mi->host)
+ {
+ nx_errno = ER_BAD_HOST_ERROR;
+ goto err;
+ }
+
safe_connect(thd, mysql, mi);
if (slave_killed(thd))
goto err;