database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

--result-file in mysqltest works nicely now

Browse Source 
added a new test case that relies on --result-file


client/mysqltest.c:
  allow a mix of --result-file and @ result file specifications
mysql-test/mysql-test-run:
  -record option
  -R options to mysql-test so taht result files will be compared
This commit is contained in:
unknown
2000-12-12 15:01:35 -07:00
parent 078c05d50a
commit 798d341bf9
4 changed files with 92 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mysql-test/mysql-test-run
View File

@ -141,6 +141,12 @@ if [ "$1" = "-force" ] ; then
shift 1
fi
if [ "$1" = "-record" ] ; then
RECORD=1
shift 1
fi
if [ "$1" = "-gcov" ];
then
if [ x$BINARY_DIST = x1 ] ; then
@ -300,7 +306,7 @@ start_master()
{
cd $BASEDIR # for gcov
#start master
master_args="--no-defaults --log-bin \
master_args="--no-defaults --log-bin=master-bin \
--server-id=1 \
--basedir=$MY_BASEDIR \
--port=$MASTER_MYPORT \
@ -330,7 +336,7 @@ start_slave()
--master-host=127.0.0.1 \
--master-port=$MASTER_MYPORT \
--exit-info=256 \
--log-bin --log-slave-updates \
--log-bin=slave-bin --log-slave-updates \
--basedir=$MY_BASEDIR \
--datadir=$SLAVE_MYDDIR \
--pid-file=$SLAVE_MYPID \
@ -433,7 +439,12 @@ run_testcase ()
master_opt_file=$TESTDIR/$tname-master.opt
slave_opt_file=$TESTDIR/$tname-slave.opt
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
if [ x$RECORD = x1 ]; then
extra_flags="-r"
else
extra_flags=""
fi
if [ -f $master_opt_file ] ;
then
EXTRA_MASTER_OPT=`cat $master_opt_file`
@ -466,7 +477,8 @@ run_testcase ()
cd $MYSQL_TEST_DIR
if [ -f $tf ] ; then
mytime=`$TIME -p $MYSQL_TEST < $tf 2> $TIMEFILE`
mytime=`$TIME -p $MYSQL_TEST -R r/$tname.result $extra_flags \
< $tf 2> $TIMEFILE`
res=$?
if [ $res != 1 ]; then
@ -547,13 +559,21 @@ $ECHO $DASH72
if [ -z $1 ] ;
then
for tf in $TESTDIR/*.$TESTSUFFIX
do
run_testcase $tf
done
if [ x$RECORD = x1 ]; then
echo "Will not run in record mode without a specific test case"
else
for tf in $TESTDIR/*.$TESTSUFFIX
do
run_testcase $tf
done
fi
else
tf=$TESTDIR/$1.$TESTSUFFIX
run_testcase $tf
if [ -f $tf ] ; then
run_testcase $tf
else
echo "Test case $tf does not exist"
fi
fi
$ECHO $DASH72

16
mysql-test/r/rpl000014.result Normal file
View File

@ -0,0 +1,16 @@
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
127.0.0.1 root 9306 1 4 Yes
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
127.0.0.1 root 9306 1 73 No
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
127.0.0.1 root 9306 1 73 Yes
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
127.0.0.1 root 9306 1 173 Yes
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 73
n
1
2
3

23
mysql-test/t/rpl000014.test Normal file
View File

@ -0,0 +1,23 @@
source include/master-slave.inc;
connection master;
show master status;
connection slave;
show slave status;
change master to master_log_pos=73;
sleep 1;
slave stop;
change master to master_log_pos=73;
show slave status;
slave start;
show slave status;
change master to master_log_pos=173;
show slave status;
connection master;
show master status;
drop table if exists foo;
create table foo (n int);
insert into foo values (1),(2),(3);
connection slave;
change master to master_log_pos=73;
sleep 0.3;
select * from foo;