diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-07 00:23:29 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-07 00:23:29 +0300 |
| commit | bc4a57f01ace40255de2f8d7307254fd1d1d5bfa (patch) | |
| tree | 769340beb89f568624c1216afa9399a45d7a7e38 /mysql-test | |
| parent | dfacd7c5fa3fbdb5efff71cca71acff26da0aedd (diff) | |
| download | mariadb-git-bc4a57f01ace40255de2f8d7307254fd1d1d5bfa.tar.gz | |
After merge fixes
extra/resolveip.c:
After merge fix
mysql-test/mysql-test-run.sh:
Fixed comment
mysql-test/r/rpl_trunc_binlog.result:
Updated results
sql/log_event.cc:
Better (shorter) error message
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_trunc_binlog.result | 2 |
2 files changed, 2 insertions, 2 deletions
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; |