diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-24 08:43:34 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-24 08:43:34 +0100 |
| commit | 8f760dc08cd0620f49796c14e51d2ca1cd61228b (patch) | |
| tree | 3fdef573e0d5e1e1b95312a537e0fefad513d30d /mysql-test/mysql-test-run.sh | |
| parent | 03ad365b00c446a6da418cb9112448449f2e5a45 (diff) | |
| parent | d40f7056ae4075339b1adefdadc990fcf4e5f4d0 (diff) | |
| download | mariadb-git-8f760dc08cd0620f49796c14e51d2ca1cd61228b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
mysql-test/t/trigger-compat.test:
Manual merge, remove the "--text" argument, not portable
mysql-test/t/trigger-grant.test:
Manual merge, remove the "--text" argument, not portable
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5ab735dc2cb..82f7329bade 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -185,7 +185,8 @@ BASEDIR=`pwd` cd $CWD MYSQL_TEST_DIR=$BASEDIR/mysql-test MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR -export MYSQL_TEST_DIR MYSQL_TEST_WINDIR +MYSQLTEST_VARDIR=$MYSQL_TEST_DIR/var +export MYSQL_TEST_DIR MYSQL_TEST_WINDIR MYSQLTEST_VARDIR STD_DATA=$MYSQL_TEST_DIR/std_data hostname=`hostname` # Installed in the mysql privilege table |