diff options
| author | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
| commit | e6ecbfd629bf92c84f270119405f4796464e7f4e (patch) | |
| tree | 7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /sql/sql_repl.cc | |
| parent | a14542a61fbaabf30a2735a74401e4cd2734314d (diff) | |
| parent | 8c8244918fc37bb25656a5f8b451a362e4b16577 (diff) | |
| download | mariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz | |
merge
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index fa5b599c2f8..74a3549149b 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -377,10 +377,9 @@ void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags) if ((file=open_binlog(&log, log_file_name, &errmsg)) < 0) goto err; - if(pos < 4) + if (pos < 4) { - errmsg = "Congratulations! You have hit the magic number and can win \ -sweepstakes if you report the bug"; + errmsg = "Client requested master to start repliction from impossible position.\n"; goto err; } |