diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-04-11 16:29:15 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-04-11 16:29:15 -0600 |
| commit | 72ccee9d37277f76f68598ef0681d28719db5d6f (patch) | |
| tree | 4b54b1d16fbc8694f89016164d367301b93b1880 /mysql-test/r/rpl000001.result | |
| parent | f21a521981eb945982a81926cdc01735b689f2f0 (diff) | |
| download | mariadb-git-72ccee9d37277f76f68598ef0681d28719db5d6f.tar.gz | |
fixed bugs in the new stuff in rpl000001 test
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized
Docs/manual.texi:
updates for recent changes
mysql-test/r/rpl000001.result:
update for test case change
mysql-test/t/rpl000001.test:
fixed bugs in the test case
mysql-test/t/rpl000015.test:
wrong change - to be reversed
sql/mysqld.cc:
start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysql-test/r/rpl000001.result')
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index 57621d1ec0b..925c5599d77 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -6,7 +6,7 @@ sum(length(word)) (@id := id) - id 0 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9306 1 master-bin.001 1729584 No 1053 Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START; 0 +127.0.0.1 root 9306 1 master-bin.001 1729137 No 1053 Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START; 0 count(*) 30000 n |