Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
pull/73/head
cmiller@zippy.cornsilk.net 18 years ago
parent
0ff1b80bf0 eedde95a33
commit
04296df344
14 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      debian/po/ca.po
  2. 4
      debian/po/cs.po
  3. 4
      debian/po/da.po
  4. 4
      debian/po/gl.po
  5. 4
      debian/po/ja.po
  6. 4
      debian/po/pt_BR.po
  7. 4
      debian/po/sv.po
  8. 4
      debian/po/tr.po
  9. 2
      mysql-test/lib/mtr_report.pl
  10. 2
      mysql-test/mysql-test-run-shell.sh
  11. 2
      netware/mysql_test_run.c
  12. 2
      scripts/mysqld_safe.sh
  13. 4
      sql/mysqld.cc
  14. 2
      storage/ndb/include/ndbapi/Ndb.hpp

4
debian/po/ca.po
View File

@ -162,9 +162,9 @@ msgid ""
msgstr "" msgstr ""
#, fuzzy #, 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 "" #~ 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 #, fuzzy
#~ msgid "" #~ msgid ""

4
debian/po/cs.po
View File

@ -213,8 +213,8 @@ msgstr ""
#~ "se tabulky mohly narušit! Tento skript také rozšiřuje tabulky privilegií, " #~ "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." #~ "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 "" #~ msgid ""
#~ "MySQL will only install if you have a non-numeric hostname that is " #~ "MySQL will only install if you have a non-numeric hostname that is "

4
debian/po/da.po
View File

@ -215,8 +215,8 @@ msgstr ""
#~ "kan blive ødelagt! Dette script forbedrer også rettighedstabellerne, men " #~ "kan blive ødelagt! Dette script forbedrer også rettighedstabellerne, men "
#~ "burde ikke give nogen bruger flere rettigheder, end han havde tidligere," #~ "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" #~ msgid "Install Hints"
#~ msgstr "Installationstips" #~ msgstr "Installationstips"

4
debian/po/gl.po
View File

@ -211,8 +211,8 @@ msgstr ""
#~ "privilexios, pero non se supón que vaia dar a ningún usuario máis " #~ "privilexios, pero non se supón que vaia dar a ningún usuario máis "
#~ "dereitos dos que tiña antes." #~ "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" #~ msgid "Install Hints"
#~ msgstr "Consellos de instalación" #~ msgstr "Consellos de instalación"

4
debian/po/ja.po
View File

@ -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 も参照してください"

4
debian/po/pt_BR.po
View File

@ -205,8 +205,8 @@ msgstr ""
#~ "atribuirá a nenhum usuário mais direitos do que os mesmos já possuíam " #~ "atribuirá a nenhum usuário mais direitos do que os mesmos já possuíam "
#~ "anteriormente." #~ "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 #, fuzzy
#~ msgid "Install Hints" #~ msgid "Install Hints"

4
debian/po/sv.po
View File

@ -165,8 +165,8 @@ msgstr "S
#~ "tabellerna vara skadade! Detta skript utökar även privilegietabellerna " #~ "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 " #~ "men är inte tänkte att ge någon användare mer befogenhet än vad han hade "
#~ "tidigare," #~ "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" #~ msgid "Install Hints"
#~ msgstr "Installationstips" #~ msgstr "Installationstips"
#~ msgid "" #~ msgid ""

4
debian/po/tr.po
View File

@ -162,8 +162,8 @@ msgid ""
msgstr "" msgstr ""
#, fuzzy #, 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 #, fuzzy
#~ msgid "" #~ msgid ""

2
mysql-test/lib/mtr_report.pl
View File

@ -196,7 +196,7 @@ sub mtr_report_stats ($) {
"of what went wrong.\n", "of what went wrong.\n",
"If you want to report this error, please read first ", "If you want to report this error, please read first ",
"the documentation at\n", "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) if (!$::opt_extern)
{ {

2
mysql-test/mysql-test-run-shell.sh
View File

@ -990,7 +990,7 @@ show_failed_diff ()
$DIFF -c $result_file $reject_file $DIFF -c $result_file $reject_file
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
echo "Please follow the instructions outlined at" 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 "to find the reason to this problem and how to report this."
echo "" echo ""
fi fi

2
netware/mysql_test_run.c
View File

@ -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("\nThe .out and .err files in %s may give you some\n", result_dir);
log_msg("hint of what went wrong.\n"); 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("\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); log_msg("\n%.02f total minutes elapsed in the test cases\n\n", total_time / 60);

2
scripts/mysqld_safe.sh
View File

@ -396,7 +396,7 @@ then
does not exist or is not executable. Please cd to the mysql installation does not exist or is not executable. Please cd to the mysql installation
directory and restart this script from there as follows: directory and restart this script from there as follows:
./bin/mysqld_safe& ./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 exit 1
fi fi

4
sql/mysqld.cc
View File

@ -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\ 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\ 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\ 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); thread_count);
} }
#endif /* HAVE_LINUXTHREADS */ #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, "thd->thread_id=%lu\n", (ulong) thd->thread_id);
} }
fprintf(stderr, "\ 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"); information that should help you find out what is causing the crash.\n");
fflush(stderr); fflush(stderr);
#endif /* HAVE_STACKTRACE */ #endif /* HAVE_STACKTRACE */

2
storage/ndb/include/ndbapi/Ndb.hpp
View File

@ -17,7 +17,7 @@
@mainpage NDB API Programmers' Guide @mainpage NDB API Programmers' Guide
This guide assumes a basic familiarity with MySQL Cluster concepts found 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. Some of the fundamental ones are also described in section @ref secConcepts.
The NDB API is a MySQL Cluster application interface The NDB API is a MySQL Cluster application interface

Write Preview
Loading…
Cancel
Save