diff options
| author | unknown <guilhem@mysql.com> | 2003-12-19 23:05:07 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-12-19 23:05:07 +0100 |
| commit | 5084b6b701ef5f2c2d1539a8775774c6c9bbf995 (patch) | |
| tree | 50edba9e847c863859ce7be00e6bbda0b26f939b /sql/sql_repl.cc | |
| parent | 62554f812e91ba251abb3e45dd1c3036cd96069a (diff) | |
| parent | b41e6294ca97aaeb403972feb19ecc6d177096ca (diff) | |
| download | mariadb-git-5084b6b701ef5f2c2d1539a8775774c6c9bbf995.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
include/my_sys.h:
Auto merged
mysql-test/r/rpl_max_relay_size.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/rpl_trunc_binlog.result:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_max_relay_size.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_trunc_binlog.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
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 fd0096eb7a0..5ba2e3178ff 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -777,7 +777,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)) @@ -798,7 +798,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, @@ -1073,7 +1073,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)) { @@ -1304,7 +1304,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; @@ -1313,8 +1313,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) |