diff options
| author | monty@narttu.mysql.fi <> | 2003-06-04 19:21:51 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-04 19:21:51 +0300 |
| commit | 40109c574ac5672a44aa963bbd4c239d1c067deb (patch) | |
| tree | 6b8e47374bf313429416a26678bc409946f34772 /mysql-test/mysql-test-run.sh | |
| parent | 23145cfed72954c29f5a47e82af22898164be4b0 (diff) | |
| parent | 6217b578b9b9a6f65b6891b888be357d3148f4d0 (diff) | |
| download | mariadb-git-40109c574ac5672a44aa963bbd4c239d1c067deb.tar.gz | |
Merge with 4.0.13
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 81e3f866709..137e99f48b3 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -13,12 +13,15 @@ DB=test DBPASSWD= VERBOSE="" USE_MANAGER=0 -TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work +MY_TZ=GMT-3 +TZ=$MY_TZ; export TZ # for UNIX_TIMESTAMP tests to work #++ # Program Definitions #-- +LC_COLLATE=C +export LC_COLLATE PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/openwin/bin:/usr/bin/X11:$PATH MASTER_40_ARGS="--rpl-recovery-rank=1 --init-rpl-role=master" @@ -1163,9 +1166,18 @@ run_testcase () if [ -f $master_opt_file ] ; then EXTRA_MASTER_OPT=`$CAT $master_opt_file | $SED -e "s;\\$MYSQL_TEST_DIR;$MYSQL_TEST_DIR;"` + case "$EXTRA_MASTER_OPT" in + --timezone=*) + TZ=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--timezone=;;"` + export TZ + # Note that this must be set to space, not "" for test-reset to work + EXTRA_MASTER_OPT=" " + ;; + esac stop_master echo "CURRENT_TEST: $tname" >> $MASTER_MYERR start_master + TZ=$MY_TZ; export TZ else if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] || [ -f $master_init_script ] then |