diff options
| author | unknown <serg@serg.mysql.com> | 2000-12-07 00:18:46 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-12-07 00:18:46 +0100 |
| commit | 0e122da91c586231933afd35c0152e5a8e826744 (patch) | |
| tree | f0172afdd76dceaf5fcbd2bf0b5300d34889e369 /mysql-test/mysql-test-run | |
| parent | 3427432f4c653fd2ba40d3d57cd8576cf98e7835 (diff) | |
| download | mariadb-git-0e122da91c586231933afd35c0152e5a8e826744.tar.gz | |
myrg_rrnd.c merge + insert OK
myrg_info.c merge + insert OK
mymrgdef.h merge + insert OK
mrg000001.test test for the above
mysql-test-run compatibility (FreeBSD) changes from mysql-4.0 backpropagated
mysql-test/mysql-test-run:
compatibility (FreeBSD) changes from mysql-4.0 backpropagated
myisammrg/mymrgdef.h:
merge + insert OK
myisammrg/myrg_info.c:
merge + insert OK
myisammrg/myrg_rrnd.c:
merge + insert OK
Diffstat (limited to 'mysql-test/mysql-test-run')
| -rwxr-xr-x | mysql-test/mysql-test-run | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run index 740f10f1cad..a1adc247ef1 100755 --- a/mysql-test/mysql-test-run +++ b/mysql-test/mysql-test-run @@ -147,7 +147,7 @@ echo_pass () { prompt_user () { echo $1 - read + read not_used } echo_fail () { @@ -285,7 +285,7 @@ start_slave() --master-connect-retry=1 \ --master-host=127.0.0.1 \ --master-port=$MASTER_MYPORT \ - --core-file \ + --core-file --log-bin --log-slave-updates \ --basedir=$CWD \ --datadir=$SLAVE_MYDDIR \ --pid-file=$SLAVE_MYPID \ @@ -363,7 +363,7 @@ run_testcase () tname=`$ECHO $tname | $CUT -d . -f 1` master_opt_file=$TESTDIR/$tname-master.opt slave_opt_file=$TESTDIR/$tname-slave.opt - SKIP_SLAVE=`$EXPR \( match $tname rpl \) = 0` + SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` if [ -f $master_opt_file ] ; then |
