diff options
| author | guilhem@mysql.com <> | 2003-06-03 23:14:09 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-06-03 23:14:09 +0200 |
| commit | c172cab87538674d84fda28de42d3334de982ef0 (patch) | |
| tree | a22f48fd10bf00e97aae33278c36620d7507eb20 /sql/sql_repl.cc | |
| parent | 5a6d4e7e3b5c00cd92f8e97fe45316506a19236b (diff) | |
| parent | 4a80a6c7b9a7f81e239a667145e71e6d4e40212a (diff) | |
| download | mariadb-git-c172cab87538674d84fda28de42d3334de982ef0.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 283dd20a56c..ca993c053a1 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -961,7 +961,7 @@ int show_binlog_events(THD* thd) { LEX_MASTER_INFO *lex_mi = &thd->lex.mi; ha_rows event_count, limit_start, limit_end; - my_off_t pos = lex_mi->pos; + my_off_t pos = max(BIN_LOG_HEADER_SIZE, lex_mi->pos); // user-friendly char search_file_name[FN_REFLEN], *name; const char *log_file_name = lex_mi->log_file_name; pthread_mutex_t *log_lock = mysql_bin_log.get_log_lock(); @@ -989,12 +989,6 @@ int show_binlog_events(THD* thd) if ((file=open_binlog(&log, linfo.log_file_name, &errmsg)) < 0) goto err; - if (pos < 4) - { - errmsg = "Invalid log position"; - goto err; - } - pthread_mutex_lock(log_lock); my_b_seek(&log, pos); |