diff options
| author | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:09:45 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2006-02-28 15:09:45 -0600 |
| commit | 74ee3a125cbf236cc241d9fa791c2ed9df6f8dcc (patch) | |
| tree | c2cfe7e8d47acd67cf8960d8b0cbf0f13cc0f706 /mysql-test | |
| parent | 046530d5bc1a91131bbebaaab043486d5cb03988 (diff) | |
| parent | 8d5f0fcddcb7b3c5dd7d2f79dd04ba95c61779e9 (diff) | |
| download | mariadb-git-74ee3a125cbf236cc241d9fa791c2ed9df6f8dcc.tar.gz | |
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
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 |
3 files changed, 5 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 |