summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl000001.result
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-04-12 13:46:19 -0600
committersasha@mysql.sashanet.com <>2001-04-12 13:46:19 -0600
commit1915d11bb4b87d16bbab5ddbad0021d5f87dcf53 (patch)
tree6b6eccc0d4314f9fdf07f9dfbc2a30d22af14870 /mysql-test/r/rpl000001.result
parent714431e3a67b3e10ac11e5ca322862415bc47dc0 (diff)
downloadmariadb-git-1915d11bb4b87d16bbab5ddbad0021d5f87dcf53.tar.gz
BitKeeper/triggers/post-commit
do REAL_EMAIL magic mysql-test/mysql-test-run.sh added show_failed_diffs mysql-test/r/bench_count_distinct.result tired of waiting :-) mysql-test/r/rpl000001.result new test results after implementing Monty's Hack (TM) mysql-test/t/bench_count_distinct.test tired of waiting mysql-test/t/rpl000001.test implemented Monty's Hack (TM) to kill a query in the middle of update without generating a table with 30,000 rows. This will also avoice the timing uncertainty
Diffstat (limited to 'mysql-test/r/rpl000001.result')
-rw-r--r--mysql-test/r/rpl000001.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 925c5599d77..ad03b514fae 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -6,8 +6,8 @@ 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 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
+127.0.0.1 root 9306 1 master-bin.001 939 No 1053 Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' 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
+10
n
3456