diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
| commit | 11f04648f2ff2deaa00fe85ea0317c2f3d6679a9 (patch) | |
| tree | 18fac541370eed6d6619f07e64d288a8a6742b12 /mysql-test/r/rpl000015.result | |
| parent | 1e0f2b7a4288b85d6b1d287056e2acfb3257f284 (diff) | |
| download | mariadb-git-11f04648f2ff2deaa00fe85ea0317c2f3d6679a9.tar.gz | |
post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
new server getting started before the old one completely finished
shutdown. This should fix the pid warning we've been getting as well as
inconsistent results when running tests with the manager
libmysqld/lib_sql.cc:
post-merge fix
mysql-test/mysql-test-run.sh:
fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
sql/log_event.cc:
post-merge fix
sql/slave.cc:
post-merge fix
sql/slave.h:
post-merge fix
sql/sql_class.h:
post-merge fix
tools/mysqlmanager.c:
added debug message
Diffstat (limited to 'mysql-test/r/rpl000015.result')
| -rw-r--r-- | mysql-test/r/rpl000015.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 571c4c0b1e3..23f90ecde1f 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -9,16 +9,16 @@ Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Lo change master to master_host='127.0.0.1'; 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 -127.0.0.1 test 3306 60 4 mysql-relay-bin.001 4 No No 0 0 0 +127.0.0.1 test MASTER_PORT 60 4 mysql-relay-bin.001 4 No No 0 0 0 change master to master_host='127.0.0.1',master_user='root', -master_password='',master_port=9306; +master_password='',master_port=MASTER_PORT; 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 -127.0.0.1 root 9306 60 4 mysql-relay-bin.001 4 No No 0 0 0 +127.0.0.1 root MASTER_PORT 60 4 mysql-relay-bin.001 4 No No 0 0 0 slave start; 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 -127.0.0.1 root 9306 60 master-bin.001 79 mysql-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 +127.0.0.1 root MASTER_PORT 60 master-bin.001 79 mysql-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 drop table if exists t1; create table t1 (n int); insert into t1 values (10),(45),(90); |