summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-10-17 00:00:25 +0200
committerunknown <guilhem@mysql.com>2003-10-17 00:00:25 +0200
commit0b8743c1b2da849d876887ea102c44a7ca9c1c37 (patch)
treef6975c5d89c53b30ccfb13ff2d17e84f719b0aa9 /sql
parent1b6cffff79c7a0e560cf2ee0e33224f8c0e5a4fb (diff)
downloadmariadb-git-0b8743c1b2da849d876887ea102c44a7ca9c1c37.tar.gz
A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER
while the slave is connected. mysql-test/t/rpl_trunc_binlog.test: don't RESET MASTER while the slave is connected; this could confuse the master or slave. (In replication you don't RESET MASTER while a slave is connected!) sql/slave.cc: typo
Diffstat (limited to 'sql')
-rw-r--r--sql/slave.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 9c380408291..b679ac2f6b8 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -1337,7 +1337,7 @@ file '%s', errno %d)", fname, my_errno);
if (init_relay_log_pos(rli,NullS,BIN_LOG_HEADER_SIZE,0 /* no data lock */,
&msg))
{
- sql_print_error("Failed to open the relay log 'FIRST' (relay_log_pos 4");
+ sql_print_error("Failed to open the relay log 'FIRST' (relay_log_pos 4)");
goto err;
}
rli->master_log_name[0]= 0;