diff options
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index ac1755cab9c..9b2142883d3 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -247,7 +247,6 @@ STOP_WAIT_TIMEOUT=10 MYSQL_TEST_SSL_OPTS="" USE_TIMER="" USE_EMBEDDED_SERVER="" -RESULT_EXT="" TEST_MODE="" NDB_MGM_EXTRA_OPTS= @@ -260,7 +259,6 @@ while test $# -gt 0; do USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 USE_RUNNING_SERVER=0 - RESULT_EXT=".es" TEST_MODE="$TEST_MODE embedded" ;; --purify) USE_PURIFY=1 @@ -761,13 +759,6 @@ show_failed_diff () result_file=r/$1.result eval_file=r/$1.eval - # If we have an special externsion for result files we use it if we are recording - # or a result file with that extension exists. - if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] - then - result_file="$result_file$RESULT_EXT" - fi - if [ -f $eval_file ] then result_file=$eval_file @@ -1513,9 +1504,6 @@ run_testcase () result_file="r/$tname.result" echo $tname > $CURRENT_TEST 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 if [ "$USE_MANAGER" = 1 ] ; then many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi @@ -1573,33 +1561,8 @@ run_testcase () # script soon anyway so it is not worth it spending the time if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then for t in \ - "alter_table" \ - "bdb-deadlock" \ - "connect" \ - "ctype_latin1_de" \ - "ctype_ucs" \ - "flush_block_commit" \ - "grant2" \ - "grant_cache" \ - "grant" \ - "init_connect" \ - "init_file" \ - "innodb" \ - "innodb-deadlock" \ - "innodb-lock" \ - "mix_innodb_myisam_binlog" \ - "mysqlbinlog2" \ - "mysqlbinlog" \ - "mysqldump" \ - "mysql_protocols" \ - "packet" \ - "ps_1general" \ - "rename" \ - "show_check" \ - "system_mysql_db_fix" \ - "timezone2" \ - "user_var" \ - "variables" + "init_connect" \ + "init_file" do if [ "$tname" = "$t" ] ; then skip_test $tname @@ -1623,10 +1586,8 @@ run_testcase () --result-file=*) result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"` result_file="r/$result_file.result" - if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then - result_file="$result_file$RESULT_EXT" - fi - # Note that this must be set to space, not "" for test-reset to work + # Note that this must be set to space, not "" for test-reset to +# work EXTRA_MASTER_OPT=" " ;; esac |