diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-04-15 17:12:02 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-04-15 17:12:02 -0600 |
| commit | 668ddf17e43ccd7ddf916a88edf5ef42973d395c (patch) | |
| tree | b49e5cdb7d55160a5dc579e778b1cadca20f99cd /mysql-test | |
| parent | a2ce6c71b836c627e71fe37f0aa312b11e59f571 (diff) | |
| parent | 74fccd18016a841faee48808c7bcfdf284b7ec98 (diff) | |
| download | mariadb-git-668ddf17e43ccd7ddf916a88edf5ef42973d395c.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000014.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index ded11a9bb95..c9926c92a4f 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -8,7 +8,7 @@ File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 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.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 124 +127.0.0.1 root MASTER_PORT 1 master-bin.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 128 change master to master_log_pos=73; slave stop; change master to master_log_pos=73; diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 70fbe32845d..f5885085dee 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -75,7 +75,7 @@ slave-bin.002 115 Query 1 62 use test; insert into t1 values (1) slave-bin.002 175 Query 1 122 use test; drop table t1 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 170 slave-relay-bin.002 916 master-bin.002 Yes Yes 0 0 170 920 +127.0.0.1 root MASTER_PORT 1 master-bin.002 170 slave-relay-bin.002 916 master-bin.002 Yes Yes 0 0 170 924 show new master for slave with master_log_file='master-bin.001' and master_log_pos=4 and master_server_id=1; Log_name Log_pos |