diff options
| -rw-r--r-- | innobase/pars/pars0opt.c | 3 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/innobase/pars/pars0opt.c b/innobase/pars/pars0opt.c index 35d39caad00..3c378ec8ba2 100644 --- a/innobase/pars/pars0opt.c +++ b/innobase/pars/pars0opt.c @@ -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++; } diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 13548be834c..26d2af244ea 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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 |