summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-02-15 03:43:14 +0200
committermonty@donna.mysql.com <>2001-02-15 03:43:14 +0200
commit450d98e3418fc3e267833d3ad13d45b539269fac (patch)
tree48461790e73014dbea005fbd6ef8d48e83cc6f14 /sql/slave.cc
parent7de40020d7684af7ec139455ca99ce6480f434e0 (diff)
downloadmariadb-git-450d98e3418fc3e267833d3ad13d45b539269fac.tar.gz
Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue) Fixed that mysqlbinlog writes SET TIMESTAMP before all queries Fixed comments in default my.cnf files
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 5a110b6921b..e704f471781 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1250,8 +1250,10 @@ reconnecting to retry, log '%s' position %ld", RPL_LOG_NAME,
thd->proc_info = "processing master log event";
if(exec_event(thd, &mysql->net, &glob_mi, event_len))
{
- sql_print_error("Error running query, slave aborted. Fix the problem, and re-start\
- the slave thread with mysqladmin start-slave - log '%s' position %ld",
+ sql_print_error("\
+Error running query, slave aborted. Fix the problem, and re-start \
+the slave thread with \"mysqladmin start-slave\". We stopped at log \
+'%s' position %ld",
RPL_LOG_NAME, glob_mi.pos);
goto err;
// there was an error running the query