diff options
| author | unknown <monty@bitch.mysql.fi> | 2002-06-08 21:02:01 +0300 |
|---|---|---|
| committer | unknown <monty@bitch.mysql.fi> | 2002-06-08 21:02:01 +0300 |
| commit | 770aa9f2d10ac3b10d5e80c88cc154c3fa3cf81b (patch) | |
| tree | dd6fcd7f2120c05a87f087ac245b6ceed6597399 /sql/repl_failsafe.cc | |
| parent | 330addff25cc339b83d366c27d3cb02e0581abca (diff) | |
| download | mariadb-git-770aa9f2d10ac3b10d5e80c88cc154c3fa3cf81b.tar.gz | |
Added a lot of DBUG_xxx statements to be able to find replication bug.
Fixed critical bug on 64 bit systems.
Cleanups
BUILD/compile-solaris-sparc-purify:
Added --debug option.
sql/log_event.cc:
Added DBUG_xxx statements.
Cleanup
sql/opt_range.h:
Dummy fix to remove warnings in purify
sql/repl_failsafe.cc:
Cleanup
sql/slave.cc:
Added DBUG statements to be able to find bugs.
Optimized code.
Fixed critical bug on 64 bit systems.
sql/sql_repl.cc:
Added DBUG_xx statements.
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index c7ca906ca13..961047d883a 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -811,8 +811,9 @@ int load_master_data(THD* thd) strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); active_mi->master_log_pos = strtoull(row[1], (char**) 0, 10); - if (active_mi->master_log_pos < 4) - active_mi->master_log_pos = 4; // don't hit the magic number + // don't hit the magic number + if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE) + active_mi->master_log_pos = BIN_LOG_HEADER_SIZE; active_mi->rli.pending = 0; flush_master_info(active_mi); } |