summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-06 09:40:42 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-06 09:40:42 +0200
commit3ae91695de838aad59a01f7766ee1aa43470ea6f (patch)
treebd34a4d051592bd2ba6836b6b2e055ffec4e526f /mysql-test
parent8b1751e5c35bbde1af36a104f1cf7b3c2ab4e919 (diff)
downloadmariadb-git-3ae91695de838aad59a01f7766ee1aa43470ea6f.tar.gz
BUG#12959 mysqltest crashes if testcase passed with -x option
- Update test cases mysql-test/t/mysqltest.test: Uncomment the mysqltest -x test. Can't get the output to end up in the result file.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/mysqltest.test10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 04fed048674..39c1e867f28 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -812,11 +812,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
---exec $MYSQL_TEST -x $MYSQL_TEST_DIR/include/mysqltest-x.inc
---exec $MYSQL_TEST --result_file=$MYSQL_TEST_DIR/include/mysqltest-x.inc
---error 1
---exec $MYSQL_TEST -x non_existing_file.inc
+#--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
# ----------------------------------------------------------------------------