diff options
| author | unknown <konstantin@mysql.com> | 2005-06-07 14:50:45 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-06-07 14:50:45 +0400 |
| commit | edb38786c9c5af2a1d48b524c6c292271ce8ee81 (patch) | |
| tree | d468527d5a1d3495eeb23ba14c41ce8980271729 /sql/sql_repl.cc | |
| parent | c7787f8af1be3b64e22fd00659b453972b94476c (diff) | |
| parent | 5188f031ae9b8b7eca9092b82d454a567154737a (diff) | |
| download | mariadb-git-edb38786c9c5af2a1d48b524c6c292271ce8ee81.tar.gz | |
Manual merge.
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 9e82661d790..87bf5463ffa 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1316,6 +1316,7 @@ bool mysql_show_binlog_events(THD* thd) if (mysql_bin_log.is_open()) { LEX_MASTER_INFO *lex_mi= &thd->lex->mi; + SELECT_LEX_UNIT *unit= &thd->lex->unit; ha_rows event_count, limit_start, limit_end; my_off_t pos = max(BIN_LOG_HEADER_SIZE, lex_mi->pos); // user-friendly char search_file_name[FN_REFLEN], *name; @@ -1324,8 +1325,9 @@ bool mysql_show_binlog_events(THD* thd) LOG_INFO linfo; Log_event* ev; - limit_start= thd->lex->current_select->offset_limit; - limit_end= thd->lex->current_select->select_limit + limit_start; + unit->set_limit(thd->lex->current_select); + limit_start= unit->offset_limit_cnt; + limit_end= unit->select_limit_cnt; name= search_file_name; if (log_file_name) |