diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-20 14:11:58 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-20 14:11:58 +0200 |
| commit | 0aee9b2c19b52be26e9a0dc67ae178ccfa70db35 (patch) | |
| tree | 30ceb7fd83e298b75ba1c741948bc074329fc087 /mysql-test/t | |
| parent | 6bec4bc605961b7c8066a8d8e594dc60aabd5e75 (diff) | |
| download | mariadb-git-0aee9b2c19b52be26e9a0dc67ae178ccfa70db35.tar.gz | |
BUG#12959 mysqltest crashes if testcase passed with -x option
- Enable testcases after help from Serg
client/mysqltest.c:
Dump output to stdout if no result file is specified
Don't print verbose_msg when command fails whith expected error
mysql-test/mysql-test-run.pl:
Don't add all args to the MYSQL_TEST environment variable.
mysql-test/r/mysqltest.result:
Add test for mysqltest -x
mysql-test/t/mysqltest.test:
Add test for mysqltest -x
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index fc9f621f7cd..7ed204fc6d3 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -810,11 +810,11 @@ select "a" as col1, "c" as col2; # ---------------------------------------------------------------------------- # -x <file_name>, use the file specified after -x as the test file -#--exec $MYSQL_TEST < $MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1 -#--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1 -#--exec $MYSQL_TEST --result_file=$MYSQL_TEST_DIR/include/mysqltest-x.inc 2>&1 -#--error 1 -#--exec $MYSQL_TEST -x non_existing_file.inc 2>&1 +--exec $MYSQL_TEST < $MYSQL_TEST_DIR/include/mysqltest-x.inc +--exec $MYSQL_TEST -x $MYSQL_TEST_DIR/include/mysqltest-x.inc +--exec $MYSQL_TEST --test_file=$MYSQL_TEST_DIR/include/mysqltest-x.inc +--error 1 +--exec $MYSQL_TEST -x non_existing_file.inc 2>&1 # ---------------------------------------------------------------------------- |