diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-04-11 16:49:40 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-04-11 16:49:40 -0600 |
| commit | d6ca0213b02c70c1ba4ecef9885825d111b94eb0 (patch) | |
| tree | 34c0fed8e49bc3c4d1d83cdfaec580122ccbadad /mysql-test | |
| parent | e9d687674b748f715a696229e3c00e5b095b95d9 (diff) | |
| parent | 46e73b40a8a0867f4cfeb3d56ee15995e342d7e2 (diff) | |
| download | mariadb-git-d6ca0213b02c70c1ba4ecef9885825d111b94eb0.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000001.test | 8 | ||||
| -rwxr-xr-x | mysql-test/t/rpl000015-slave.sh | 1 | ||||
| -rwxr-xr-x | mysql-test/t/rpl000016-slave.sh | 1 |
4 files changed, 11 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 diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index c2a6b2aaec9..1170cbebeaf 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -20,8 +20,14 @@ drop table t1; save_master_pos; connection slave; sync_with_master; + #test handling of aborted connection in the middle of update connection master; +reset master; +connection slave; +reset slave; + +connection master; drop table if exists t1,t2; create table t1(n int); let $1=30000; @@ -44,6 +50,8 @@ connection master; reap; connection slave; sync_with_master ; +#give the slave a chance to exit +sleep 0.5; show slave status; set sql_slave_skip_counter=1; slave start; diff --git a/mysql-test/t/rpl000015-slave.sh b/mysql-test/t/rpl000015-slave.sh new file mode 100755 index 00000000000..a421a6f287b --- /dev/null +++ b/mysql-test/t/rpl000015-slave.sh @@ -0,0 +1 @@ +rm $MYSQL_TEST_DIR/var/slave-data/master.info diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl000016-slave.sh new file mode 100755 index 00000000000..a421a6f287b --- /dev/null +++ b/mysql-test/t/rpl000016-slave.sh @@ -0,0 +1 @@ +rm $MYSQL_TEST_DIR/var/slave-data/master.info |