diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-10-08 12:40:21 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-10-08 12:40:21 -0400 |
| commit | 6859d8b8c73ea323dc6fd2f381f9d228c33d93de (patch) | |
| tree | fb68c0de78382c33518e3a3a00c34603162650d4 /mysql-test | |
| parent | 6b957bcba4b54168219c92152e2f7ab158db5c74 (diff) | |
| parent | 6f2c2dc8e804d5a5a80fae49d7fa98cc2c76639f (diff) | |
| download | mariadb-git-6859d8b8c73ea323dc6fd2f381f9d228c33d93de.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
netware/mysql_test_run.c:
Auto merged
sql/mysqld.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
scripts/mysqld_safe.sh:
Manual merge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_report.pl | 2 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run-shell.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index dcd7d1ec842..7cd6c1362b3 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -196,7 +196,7 @@ sub mtr_report_stats ($) { "of what went wrong.\n", "If you want to report this error, please read first ", "the documentation at\n", - "http://www.mysql.com/doc/en/MySQL_test_suite.html\n"; + "http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n"; } if (!$::opt_extern) { diff --git a/mysql-test/mysql-test-run-shell.sh b/mysql-test/mysql-test-run-shell.sh index ab511a932e6..ea8ce1b76d4 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -990,7 +990,7 @@ show_failed_diff () $DIFF -c $result_file $reject_file echo "-------------------------------------------------------" echo "Please follow the instructions outlined at" - echo "http://dev.mysql.com/doc/mysql/en/reporting-mysqltest-bugs.html" + echo "http://forge.mysql.com/wiki/MySQL_Internals_Porting#Debugging_a_MySQL_Server" echo "to find the reason to this problem and how to report this." echo "" fi |