diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-05 16:51:31 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-05 16:51:31 +0200 |
| commit | 5841856ec9777d0ef3b99ee0447e21eba51dc050 (patch) | |
| tree | aa9350452d261bd213b4a75a1a2c1b24835920c6 /mysql-test | |
| parent | dc2431242662283da7e64904f88869afd62d484c (diff) | |
| parent | 77848ae75b87b2c68f275c7be2cbed23decc1515 (diff) | |
| download | mariadb-git-5841856ec9777d0ef3b99ee0447e21eba51dc050.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
client/mysqltest.c:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
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 4de07e99b03..176bdea5be6 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 |