mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
sql/slave.cc
mutex now initialized in the constructor
sql/sql_class.h
intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
fixed typo in error message
if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''
BitKeeper/etc/ignore:
Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
sql/slave.cc:
mutex now initialized in the constructor
sql/sql_class.h:
intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc:
fixed typo in error message
if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
This commit is contained in:
@@ -228,7 +228,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags)
|
||||
|
||||
if(pos < 4)
|
||||
{
|
||||
errmsg = "Contratulations! You have hit the magic number and can win \
|
||||
errmsg = "Congratulations! You have hit the magic number and can win \
|
||||
sweepstakes if you report the bug";
|
||||
goto err;
|
||||
}
|
||||
@@ -616,7 +616,7 @@ int change_master(THD* thd)
|
||||
{
|
||||
// if we change host or port, we must reset the postion
|
||||
glob_mi.log_file_name[0] = 0;
|
||||
glob_mi.pos = 0;
|
||||
glob_mi.pos = 4; // skip magic number
|
||||
}
|
||||
|
||||
if(lex_mi->log_file_name)
|
||||
|
||||
Reference in New Issue
Block a user