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.

14 files changed, 23 insertions, 23 deletions

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 9dc1fc0de77..5019f05c909 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -162,9 +162,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
 #~ msgstr ""
-#~ "Feu una ullada al document: http://www.mysql.com/doc/en/Upgrade.html"
+#~ "Feu una ullada al document: http://dev.mysql.com/doc/mysql/en/upgrade.html"
 
 #, fuzzy
 #~ msgid ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 33e4f213bb2..ada32a3469b 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -213,8 +213,8 @@ msgstr ""
 #~ "se tabulky mohly narušit! Tento skript také rozšiřuje tabulky privilegií, "
 #~ "ovšem neměl by uživatelům přidat více práv, než měli dosud."
 
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "Také si přečtěte http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "Také si přečtěte http://dev.mysql.com/doc/mysql/en/upgrade.html"
 
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
diff --git a/debian/po/da.po b/debian/po/da.po
index 5e93e3f7b33..cfaf2705254 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -215,8 +215,8 @@ msgstr ""
 #~ "kan blive �delagt! Dette script forbedrer ogs� rettighedstabellerne, men "
 #~ "burde ikke give nogen bruger flere rettigheder, end han havde tidligere,"
 
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "L�s ogs� http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "L�s ogs� http://dev.mysql.com/doc/mysql/en/upgrade.html"
 
 #~ msgid "Install Hints"
 #~ msgstr "Installationstips"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 44fd58872cc..de5356e24f3 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -211,8 +211,8 @@ msgstr ""
 #~ "privilexios, pero non se supón que vaia dar a ningún usuario máis "
 #~ "dereitos dos que tiña antes."
 
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "Lea tamén http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "Lea tamén http://dev.mysql.com/doc/mysql/en/upgrade.html"
 
 #~ msgid "Install Hints"
 #~ msgstr "Consellos de instalación"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 14d97ed977b..5d9151da652 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -274,5 +274,5 @@ msgstr ""
 #~ "す。スクリプトは、どのようなユーザに対しても、以前に保持していた以上の権限"
 #~ "を与えるようにはなっていません。"
 
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "http://www.mysql.com/doc/ja/Upgrade.html も参照してください"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "http://dev.mysql.com/doc/mysql/ja/upgrade.html も参照してください"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 51557b006e6..e7684ae7bd6 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -205,8 +205,8 @@ msgstr ""
 #~ "atribuirá a nenhum usuário mais direitos do que os mesmos já possuíam "
 #~ "anteriormente."
 
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "Por favor, leia http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "Por favor, leia http://dev.mysql.com/doc/mysql/en/upgrade.html"
 
 #, fuzzy
 #~ msgid "Install Hints"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 54ef9246236..62f471dea0f 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -165,8 +165,8 @@ msgstr "S�ttet som l�senorden lagrades p� var inte s�rskilt s�kert. Detta har f�
 #~ "tabellerna vara skadade! Detta skript ut�kar �ven privilegietabellerna "
 #~ "men �r inte t�nkte att ge n�gon anv�ndare mer befogenhet �n vad han hade "
 #~ "tidigare,"
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "L�s �ven http://www.mysql.com/doc/en/Upgrade.html"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "L�s �ven http://dev.mysql.com/doc/mysql/en/upgrade.html"
 #~ msgid "Install Hints"
 #~ msgstr "Installationstips"
 #~ msgid ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 20b4df45b6e..b81d28957e1 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -162,8 +162,8 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#~ msgid "Please also read http://www.mysql.com/doc/en/Upgrade.html"
-#~ msgstr "Lütfen http://www.mysql.com/doc/en/Upgrade.html belgesini okuyun"
+#~ msgid "Please also read http://dev.mysql.com/doc/mysql/en/upgrade.html"
+#~ msgstr "Lütfen http://dev.mysql.com/doc/mysql/en/upgrade.html belgesini okuyun"
 
 #, fuzzy
 #~ msgid ""
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
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index e2aabec0fca..c32abce20d3 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -175,7 +175,7 @@ void report_stats()
 		log_msg("\nThe .out and .err files in %s may give you some\n", result_dir);
 		log_msg("hint of what went wrong.\n");
 		log_msg("\nIf you want to report this error, please first read the documentation\n");
-		log_msg("at: http://www.mysql.com/doc/en/MySQL_test_suite.html\n");
+		log_msg("at: http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html\n");
   }
 
   log_msg("\n%.02f total minutes elapsed in the test cases\n\n", total_time / 60);
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index d9c1a16e21a..99dcafbbf71 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -396,7 +396,7 @@ then
 does not exist or is not executable. Please cd to the mysql installation
 directory and restart this script from there as follows:
 ./bin/mysqld_safe&
-See http://dev.mysql.com/doc/mysql/en/mysqld_safe.html for more information"
+See http://dev.mysql.com/doc/mysql/en/mysqld-safe.html for more information"
   exit 1
 fi
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a7a41496b88..a355c560996 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2229,7 +2229,7 @@ bytes of memory\n", ((ulong) dflt_key_cache->key_cache_mem_size +
 You seem to be running 32-bit Linux and have %d concurrent connections.\n\
 If you have not changed STACK_SIZE in LinuxThreads and built the binary \n\
 yourself, LinuxThreads is quite likely to steal a part of the global heap for\n\
-the thread stack. Please read http://www.mysql.com/doc/en/Linux.html\n\n",
+the thread stack. Please read http://dev.mysql.com/doc/mysql/en/linux.html\n\n",
 	    thread_count);
   }
 #endif /* HAVE_LINUXTHREADS */
@@ -2249,7 +2249,7 @@ Some pointers may be invalid and cause the dump to abort...\n");
     fprintf(stderr, "thd->thread_id=%lu\n", (ulong) thd->thread_id);
   }
   fprintf(stderr, "\
-The manual page at http://www.mysql.com/doc/en/Crashing.html contains\n\
+The manual page at http://dev.mysql.com/doc/mysql/en/crashing.html contains\n\
 information that should help you find out what is causing the crash.\n");
   fflush(stderr);
 #endif /* HAVE_STACKTRACE */
diff --git a/storage/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp
index 4d0219d1a3c..995ce67e61d 100644
--- a/storage/ndb/include/ndbapi/Ndb.hpp
+++ b/storage/ndb/include/ndbapi/Ndb.hpp
@@ -17,7 +17,7 @@
    @mainpage                            NDB API Programmers' Guide
 
    This guide assumes a basic familiarity with MySQL Cluster concepts found
-   on http://dev.mysql.com/doc/mysql/en/NDBCluster.html .
+   on http://dev.mysql.com/doc/mysql/en/mysql-cluster.html.
    Some of the fundamental ones are also described in section @ref secConcepts.
 
    The NDB API is a MySQL Cluster application interface