mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
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.
This commit is contained in:
parent
54a5e17dbd
commit
ab5479e6e2
2 changed files with 3 additions and 4 deletions
|
@ -569,7 +569,9 @@ error () {
|
|||
}
|
||||
|
||||
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() {
|
||||
|
|
|
@ -73,12 +73,9 @@ insert into t2 values(1234);
|
|||
|
||||
#same value on the master
|
||||
connection master;
|
||||
save_master_pos;
|
||||
set insert_id=1234;
|
||||
insert into t2 values(NULL);
|
||||
connection slave;
|
||||
sync_with_master;
|
||||
|
||||
wait_for_slave_to_stop;
|
||||
|
||||
#restart slave skipping one event
|
||||
|
|
Loading…
Reference in a new issue