diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-05 16:50:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-05 16:50:32 +0200 |
| commit | e10b50e6f13206ec8fc320518d4460ca39a12ed2 (patch) | |
| tree | 8b2acb1a2b0329b24a35f27baa612f5c387659b9 /mysql-test | |
| parent | 7f98b2a04625a9255103db171e542e523aa0b161 (diff) | |
| download | mariadb-git-e10b50e6f13206ec8fc320518d4460ca39a12ed2.tar.gz | |
Bug#12959 mysqltest crashes if testcase passed with -x option
client/mysqltest.c:
Fixes for mysqltest -x <filename>
mysql-test/t/mysqltest.test:
Test mysqltest -x <filename>
mysql-test/include/mysqltest-x.inc:
New BitKeeper file ``mysql-test/include/mysqltest-x.inc''
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/mysqltest-x.inc | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/include/mysqltest-x.inc b/mysql-test/include/mysqltest-x.inc new file mode 100644 index 00000000000..dd1468aed07 --- /dev/null +++ b/mysql-test/include/mysqltest-x.inc @@ -0,0 +1,2 @@ +echo Output from mysqltest-x.inc; + diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index bfb1919e75c..4c23f915503 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -792,6 +792,19 @@ select "a" as col1, "c" as col2; --error 1 --exec echo "save_master_pos; sync_with_master a;" | $MYSQL_TEST 2>&1 + +# ---------------------------------------------------------------------------- +# Test mysqltest arguments +# ---------------------------------------------------------------------------- + +# -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 + + # ---------------------------------------------------------------------------- # TODO Test queries, especially their errormessages... so it's easy to debug # new scripts and diagnose errors |