Commit e517bb0d authored by unknown's avatar unknown
Browse files

Fix of test-suite failures which popped up after addition of federated 

storage engine.


mysql-test/mysql-test-run.sh:
  We should skip starting of slave server only if test is BOTH 
  not replication related and not federated storage engine related.
mysql-test/r/ps_1general.result:
  Fixed test result after federated storage engine was added.
parent 0a53b531

mysql-test/mysql-test-run.sh

+1 −2
Original line number Diff line number Diff line
@@ -1347,8 +1347,7 @@ run_testcase () 
 tsrcdir=$TESTDIR/$tname-src

 result_file="r/$tname.result"

 echo $tname > $CURRENT_TEST

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`

 SKIP_SLAVE=`$EXPR \( $tname : federated \) = 0`

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0 \& \( $tname : federated \) = 0`

 if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then

   result_file="$result_file$RESULT_EXT"

 fi

mysql-test/r/ps_1general.result

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ NDB YES/NO Alias for NDBCLUSTER 
EXAMPLE	YES/NO	Example storage engine

ARCHIVE	YES/NO	Archive storage engine

CSV	YES/NO	CSV storage engine

FEDERATED	YES/NO	Federated MySQL storage engine

drop table if exists t5;

prepare stmt1 from ' drop table if exists t5 ' ;

execute stmt1 ;