Commit ab5479e6 authored by guilhem@mysql.com's avatar guilhem@mysql.com

Better error reporting in mysql-test-run (don't hide the important message

with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.
parent 54a5e17d
...@@ -569,7 +569,9 @@ error () { ...@@ -569,7 +569,9 @@ error () {
} }
error_is () { error_is () {
$CAT < $TIMEFILE | $SED -e 's/.* At line \(.*\)\: \(.*\)/ \>\> Error at line \1: \2<\</' | $HEAD -1 $ECHO "Errors are (from $TIMEFILE) :"
$CAT < $TIMEFILE
$ECHO "(the last line(s) may be the ones that caused the die() in mysqltest)"
} }
prefix_to_8() { prefix_to_8() {
......
...@@ -73,12 +73,9 @@ insert into t2 values(1234); ...@@ -73,12 +73,9 @@ insert into t2 values(1234);
#same value on the master #same value on the master
connection master; connection master;
save_master_pos;
set insert_id=1234; set insert_id=1234;
insert into t2 values(NULL); insert into t2 values(NULL);
connection slave; connection slave;
sync_with_master;
wait_for_slave_to_stop; wait_for_slave_to_stop;
#restart slave skipping one event #restart slave skipping one event
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment