mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-19 23:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source 
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
This commit is contained in:
unknown 2001-05-31 12:56:05 +02:00
commit e6ecbfd629
69 changed files with 2979 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_repl.cc
View file

@ -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;
}