mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source
This commit is contained in:
monty@narttu.mysql.fi 2003-10-07 00:23:29 +03:00
parent fa823857d3
commit 446d40e880
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extra/resolveip.c
View file

@ -40,6 +40,7 @@ extern int h_errno;
#define in_addr_t ulong #define in_addr_t ulong
#endif #endif
static my_bool silent;
static struct my_option my_long_options[] = static struct my_option my_long_options[] =
{ {

2
mysql-test/mysql-test-run.sh
View file

@ -1041,7 +1041,7 @@ EOF
mysql_start () 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 # for the test. Better to let the test start the daemon
# $ECHO "Starting MySQL daemon" # $ECHO "Starting MySQL daemon"

2
mysql-test/r/rpl_trunc_binlog.result
View file

@ -10,5 +10,5 @@ reset slave;
start slave; start slave;
show slave status; 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 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; reset master;

10
sql/log_event.cc
View file

@ -2102,10 +2102,10 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli)
if (rli->inside_transaction) if (rli->inside_transaction)
{ {
slave_print_error(rli, 0, 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 \ Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. \
the master died while writing the transaction to its binary log. Now the slave \ Probably cause is that the master died while writing the transaction to it's \
is rolling back the transaction."); binary log.");
return(1); return(1);
} }
break; 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); memcpy(rli->master_log_name, new_log_ident, ident_len+1);
rli->master_log_pos= pos; 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(); rli->relay_log_pos += get_event_len();
pthread_mutex_unlock(&rli->data_lock); pthread_mutex_unlock(&rli->data_lock);