summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-05-18 10:57:07 +0200
committerunknown <serg@serg.mylan>2005-05-18 10:57:07 +0200
commitafe67793856b04a4888696dff18b731ad4882241 (patch)
treec1edbb8d05724fe3a882b97a7173bafe0ca78392
parent2598faafd7d5bc59bedf60311988a00cfe4d3129 (diff)
downloadmariadb-git-afe67793856b04a4888696dff18b731ad4882241.tar.gz
test fixes
mysql-test/mysql-test-run.sh: always use --no-defaults mysql-test/t/range.test: range.test does not requires innodb
-rw-r--r--mysql-test/mysql-test-run.sh2
-rw-r--r--mysql-test/t/range.test2
2 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 581c6c66fdd..4fee560ee44 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -691,7 +691,7 @@ fi
MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password=$DBPASSWD $EXTRA_MYSQLDUMP_OPT"
MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"
MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
-MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
+MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR
export NDB_TOOLS_DIR
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 8c27d876bc8..b51a79fba77 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -1,5 +1,3 @@
--- source include/have_innodb.inc
-
#
# Problem with range optimizer
#