diff options
| author | sasha@mysql.sashanet.com <> | 2000-11-03 19:31:22 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-11-03 19:31:22 -0700 |
| commit | 67eef6a571894d800b2eae1502b0da3cbf254930 (patch) | |
| tree | b82e8a106a0207262ddbd495242322e06a1bc41f /sql/sql_repl.cc | |
| parent | 60cdfe07f77708ba8a391ea84448dfa66b81da9a (diff) | |
| download | mariadb-git-67eef6a571894d800b2eae1502b0da3cbf254930.tar.gz | |
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''
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5cd5d3a159e..b2c3999f92d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -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) |