summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-09-29 14:37:52 +0300
committerAndrei Elkin <aelkin@mysql.com>2009-09-29 14:37:52 +0300
commitc676cebbea734691b41bf7e8edcbe61e74a53f62 (patch)
tree465655f5634c9a3c8619c22c4dc64745a3eb1547
parentf6a8698a54c30ffd61f5aef40018d36258771ea5 (diff)
downloadmariadb-git-c676cebbea734691b41bf7e8edcbe61e74a53f62.tar.gz
WL#342 heartbeat
Improving an error report generating.
-rw-r--r--sql/slave.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 4a161a345eb..bbdfb8e633f 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1233,11 +1233,10 @@ when it try to get the value of TIME_ZONE global variable from master.";
if (mysql_real_query(mysql, query, strlen(query))
&& !check_io_slave_killed(mi->io_thd, mi, NULL))
{
- errmsg= "The slave I/O thread stops because querying master with '%s' "
- "failed; error: '%s' ";
+ errmsg= "The slave I/O thread stops because SET @master_heartbeat_period "
+ "on master failed.";
err_code= ER_SLAVE_FATAL_ERROR;
- sprintf(err_buff, "%s Error: %s", errmsg,
- query, mysql_error(mysql));
+ sprintf(err_buff, "%s Error: %s", errmsg, mysql_error(mysql));
mysql_free_result(mysql_store_result(mysql));
goto err;
}