diff options
| author | paul@snake-hub.snake.net <> | 2006-02-28 18:48:58 -0600 |
|---|---|---|
| committer | paul@snake-hub.snake.net <> | 2006-02-28 18:48:58 -0600 |
| commit | 21f0adc7c600e1848c757826bda08fed0a17b0ac (patch) | |
| tree | e77ef5390234431f0fadd432fd1080d0a6a0858e /mysql-test | |
| parent | f641a919432b21b478b2ab4b1bacd1096d6c6d84 (diff) | |
| parent | 5ac33e8eb8628e28bf434caaed2bd469cf08016f (diff) | |
| download | mariadb-git-21f0adc7c600e1848c757826bda08fed0a17b0ac.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/README | 2 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 | ||||
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/README b/mysql-test/README index 10d64784ed4..0e20ca884a3 100644 --- a/mysql-test/README +++ b/mysql-test/README @@ -21,7 +21,7 @@ conflict with it. All tests must pass. If one or more of them fail on your system, please read the following manual section of how to report the problem: -http://dev.mysql.com/doc/mysql/en/MySQL_test_suite.html +http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html You can create your own test cases. To create a test case: diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index c6185e990bb..de76a97e17b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -894,7 +894,7 @@ show_failed_diff () $DIFF -c $result_file $reject_file echo "-------------------------------------------------------" echo "Please follow the instructions outlined at" - echo "http://www.mysql.com/doc/en/Reporting_mysqltest_bugs.html" + echo "http://dev.mysql.com/doc/mysql/en/reporting-mysqltest-bugs.html" echo "to find the reason to this problem and how to report this." echo "" fi @@ -990,7 +990,7 @@ report_stats () { $ECHO "The log files in $MY_LOG_DIR may give you some hint" $ECHO "of what went wrong." $ECHO "If you want to report this error, please read first the documentation at" - $ECHO "http://www.mysql.com/doc/en/MySQL_test_suite.html" + $ECHO "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html" fi if [ $USE_RUNNING_SERVER -eq 0 ] diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index de07021f217..9512a99e35e 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -297,7 +297,9 @@ here is the sourced script In loop here is the sourced script mysqltest: At line 1: Missing argument to sleep +mysqltest: At line 1: Missing argument to real_sleep mysqltest: At line 1: Invalid argument to sleep "abc" +mysqltest: At line 1: Invalid argument to real_sleep "abc" 1 2 101 diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 858c704c10e..f28df916ca1 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -667,10 +667,14 @@ real_sleep 1; # Missing parameter --error 1 --exec echo "sleep ;" | $MYSQL_TEST 2>&1 +--error 1 +--exec echo "real_sleep ;" | $MYSQL_TEST 2>&1 # Illegal parameter --error 1 --exec echo "sleep abc;" | $MYSQL_TEST 2>&1 +--error 1 +--exec echo "real_sleep abc;" | $MYSQL_TEST 2>&1 # ---------------------------------------------------------------------------- # Test inc |