Commit ea9e7ee4 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 1d26537d 9a17c068

innobase/pars/pars0opt.c

+2 −1
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ opt_calc_index_goodness( 
		}

	}



	if (index->type & DICT_CLUSTERED) {

	/* We have to test for goodness here, as last_op may note be set */

	if (goodness && index->type & DICT_CLUSTERED) {



		goodness++;

	}

mysql-test/mysql-test-run.sh

+4 −0
Original line number Diff line number Diff line
@@ -653,7 +653,11 @@ start_master() 
    $RM -f $MASTER_MYDDIR/log.*

    # Remove stale binary logs

    $RM -f $MYSQL_TEST_DIR/var/log/master-bin.*

    # Remove files that can cause problems

    $RM -f $MYSQL_TEST_DIR/var/run/* $MYSQL_TEST_DIR/var/tmp/*



    #run master initialization shell script if one exists



    if [ -f "$master_init_script" ] ;

    then

        /bin/sh $master_init_script