diff options
| -rw-r--r-- | extra/resolveip.c | 1 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_trunc_binlog.result | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 10 |
4 files changed, 8 insertions, 7 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c index f3c09b88e22..6d05152e20b 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -40,6 +40,7 @@ extern int h_errno; #define in_addr_t ulong #endif +static my_bool silent; static struct my_option my_long_options[] = { diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b452023dcb9..577f396440c 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1041,7 +1041,7 @@ EOF mysql_start () { -# We should not start the daemon here as we don't know the argumens +# We should not start the daemon here as we don't know the arguments # for the test. Better to let the test start the daemon # $ECHO "Starting MySQL daemon" diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index 6d2158eedfe..a006437207a 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -10,5 +10,5 @@ reset slave; start slave; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 there is an unfinished transaction in the relay log (could find neither COMMIT nor ROLLBACK in the relay log); it could be that the master died while writing the transaction to its binary log. Now the slave is rolling back the transaction. 0 79 317 +127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 317 reset master; diff --git a/sql/log_event.cc b/sql/log_event.cc index 18d1624dfde..3e9064a78ea 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2102,10 +2102,10 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli) if (rli->inside_transaction) { slave_print_error(rli, 0, - "there is an unfinished transaction in the relay log \ -(could find neither COMMIT nor ROLLBACK in the relay log); it could be that \ -the master died while writing the transaction to its binary log. Now the slave \ -is rolling back the transaction."); + "\ +Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. \ +Probably cause is that the master died while writing the transaction to it's \ +binary log."); return(1); } break; @@ -2208,7 +2208,7 @@ int Rotate_log_event::exec_event(struct st_relay_log_info* rli) { memcpy(rli->master_log_name, new_log_ident, ident_len+1); rli->master_log_pos= pos; - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) rli->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) rli->master_log_pos)); } rli->relay_log_pos += get_event_len(); pthread_mutex_unlock(&rli->data_lock); |