1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge gbichot@213.136.52.20:/home/bk/mysql-4.0

Browse Source 
into mysql.com:/home/mysql_src/mysql-4.0
This commit is contained in:
unknown 2003-06-17 16:36:29 +02:00
commit 926d86db64
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.sh
View File

@ -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() {

3
mysql-test/t/rpl_rotate_logs.test
View File

@ -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