database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/bug12959/my51-bug12959
This commit is contained in:
unknown
2005-09-05 16:52:26 +02:00
parent 644a444b6b 9fad4fded7
commit a352fdf87d
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/mysqltest-x.inc Normal file
View File

@ -0,0 +1,2 @@
echo Output from mysqltest-x.inc;

13
mysql-test/t/mysqltest.test
View File

@ -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