diff options
| author | pem@mysql.telia.com <> | 2003-09-24 15:26:20 +0200 |
|---|---|---|
| committer | pem@mysql.telia.com <> | 2003-09-24 15:26:20 +0200 |
| commit | 6e55a3428aa3615e15a1c56f47817ab6e962f036 (patch) | |
| tree | fdea976683e3ed29968154712c74254ba5b0aa07 /sql/sql_repl.cc | |
| parent | 8d884c02bb2ca2f2b4bce6dccbaf69d6935e293d (diff) | |
| download | mariadb-git-6e55a3428aa3615e15a1c56f47817ab6e962f036.tar.gz | |
Post-merge fixes.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 59a616fc77c..2c79c1dbaf9 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -697,22 +697,22 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) { pthread_mutex_lock(&mi->rli.data_lock); - if (thd->lex.mi.pos) + if (thd->lex->mi.pos) { mi->rli.until_condition= RELAY_LOG_INFO::UNTIL_MASTER_POS; - mi->rli.until_log_pos= thd->lex.mi.pos; + mi->rli.until_log_pos= thd->lex->mi.pos; /* 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, + strmake(mi->rli.until_log_name, thd->lex->mi.log_file_name, sizeof(mi->rli.until_log_name)-1); } - else if (thd->lex.mi.relay_log_pos) + else if (thd->lex->mi.relay_log_pos) { mi->rli.until_condition= RELAY_LOG_INFO::UNTIL_RELAY_POS; - mi->rli.until_log_pos= thd->lex.mi.relay_log_pos; - strmake(mi->rli.until_log_name, thd->lex.mi.relay_log_name, + mi->rli.until_log_pos= thd->lex->mi.relay_log_pos; + strmake(mi->rli.until_log_name, thd->lex->mi.relay_log_name, sizeof(mi->rli.until_log_name)-1); } else @@ -750,7 +750,7 @@ int start_slave(THD* thd , MASTER_INFO* mi, bool net_report) pthread_mutex_unlock(&mi->rli.data_lock); } - else if (thd->lex.mi.pos || thd->lex.mi.relay_log_pos) + else if (thd->lex->mi.pos || thd->lex->mi.relay_log_pos) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNTIL_COND_IGNORED, ER(ER_UNTIL_COND_IGNORED)); |