diff options
| author | pem@mysql.com <> | 2003-12-19 20:13:48 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-19 20:13:48 +0100 |
| commit | 12187684ca10653a5c3b4539b1abdf55686c23d6 (patch) | |
| tree | 73743d8dde65062bfe86e66e9d220a27139cfede /sql/sql_repl.cc | |
| parent | 843d5b907b60d64ec0512b8e49778a3fb37b380c (diff) | |
| parent | d37da004f6ffb32d170ce4cb9d93ba166de5b6b0 (diff) | |
| download | mariadb-git-12187684ca10653a5c3b4539b1abdf55686c23d6.tar.gz | |
Merging lex-pointer change from 4.1 to 5.0.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index c0ee4277128..d3c033d985c 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -679,7 +679,7 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) bit to 0 for the other thread */ if (thd->lex->slave_thd_opt) - thread_mask &= thd->lex->slave_thd_opt; + thread_mask&= thd->lex->slave_thd_opt; if (thread_mask) //some threads are stopped, start them { if (init_master_info(mi,master_info_file,relay_log_info_file, 0)) @@ -700,7 +700,7 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) mi->rli.until_condition= RELAY_LOG_INFO::UNTIL_MASTER_POS; mi->rli.until_log_pos= thd->lex->mi.pos; /* - We don't check thd->lex.mi.log_file_name for NULL here + We don't check thd->lex->mi.log_file_name for NULL here since it is checked in sql_yacc.yy */ strmake(mi->rli.until_log_name, thd->lex->mi.log_file_name, @@ -975,7 +975,7 @@ int change_master(THD* thd, MASTER_INFO* mi) } thd->proc_info = "Changing master"; - LEX_MASTER_INFO* lex_mi = &thd->lex->mi; + LEX_MASTER_INFO* lex_mi= &thd->lex->mi; // TODO: see if needs re-write if (init_master_info(mi, master_info_file, relay_log_info_file, 0)) { @@ -1204,7 +1204,7 @@ int show_binlog_events(THD* thd) if (mysql_bin_log.is_open()) { - LEX_MASTER_INFO *lex_mi = &thd->lex->mi; + LEX_MASTER_INFO *lex_mi= &thd->lex->mi; 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; @@ -1213,8 +1213,8 @@ int 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; + limit_start= thd->lex->current_select->offset_limit; + limit_end= thd->lex->current_select->select_limit + limit_start; name= search_file_name; if (log_file_name) |