diff options
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/Makefile.am | 60 | ||||
| -rw-r--r-- | sql/share/charsets/cp1251.xml | 2 | ||||
| -rw-r--r-- | sql/share/charsets/languages.html | 16 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 79 |
4 files changed, 90 insertions, 67 deletions
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am deleted file mode 100644 index 73f2ca13bb6..00000000000 --- a/sql/share/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2000 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -## Process this file with automake to create Makefile.in - -EXTRA_DIST= errmsg-utf8.txt \ - CMakeLists.txt - -dist-hook: - for dir in charsets @AVAILABLE_LANGUAGES@; do \ - test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \ - $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \ - done; \ - sleep 1 ; touch $(srcdir)/*/errmsg.sys - $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets - $(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets - -all-local: english/errmsg.sys - -# Use the english errmsg.sys as a flag that all errmsg.sys needs to be -# created. Normally these are created by extra/Makefile - -english/errmsg.sys: errmsg-utf8.txt - rm -f $(top_builddir)/include/mysqld_error.h - (cd $(top_builddir)/extra && $(MAKE)) - -install-data-local: - for lang in @AVAILABLE_LANGUAGES@; \ - do \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \ - $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \ - $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \ - done - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets - $(INSTALL_DATA) $(srcdir)/errmsg-utf8.txt \ - $(DESTDIR)$(pkgdatadir)/errmsg-utf8.txt; \ - $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README - $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets - -# FIXME maybe shouldn't remove, could be needed by other installation? -uninstall-local: - @RM@ -f -r $(DESTDIR)$(pkgdatadir) - -distclean-local: - @RM@ -f */errmsg.sys - -# Do nothing -link_sources: diff --git a/sql/share/charsets/cp1251.xml b/sql/share/charsets/cp1251.xml index b80db9f8ec0..06ba8a5a4b9 100644 --- a/sql/share/charsets/cp1251.xml +++ b/sql/share/charsets/cp1251.xml @@ -98,7 +98,7 @@ 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 005A 005B 005C 005D 005E 005F 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 006A 006B 006C 006D 006E 006F 0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 007A 007B 007C 007D 007E 007F - 0402 0403 201A 0453 201E 2026 2020 2021 0000 2030 0409 2039 040A 040C 040B 040F + 0402 0403 201A 0453 201E 2026 2020 2021 20AC 2030 0409 2039 040A 040C 040B 040F 0452 2018 2019 201C 201D 2022 2013 2014 0000 2122 0459 203A 045A 045C 045B 045F 00A0 040E 045E 0408 00A4 0490 00A6 00A7 0401 00A9 0404 00AB 00AC 00AD 00AE 0407 00B0 00B1 0406 0456 0491 00B5 00B6 00B7 0451 2116 0454 00BB 0458 0405 0455 0457 diff --git a/sql/share/charsets/languages.html b/sql/share/charsets/languages.html index 6d1a8aafc5c..76af973113e 100644 --- a/sql/share/charsets/languages.html +++ b/sql/share/charsets/languages.html @@ -1,4 +1,20 @@ #!/bin/sh + +# Copyright (C) 2003 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #<pre> ( echo "DROP TABLE lang;" diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 06f8ca5e507..c86451b89e9 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -897,7 +897,7 @@ ER_OUT_OF_SORTMEMORY HY001 S1001 cze "M-Bálo paměti pro třídění. Zvyšte velikost třídícího bufferu" dan "Ikke mere sorteringshukommelse. Øg sorteringshukommelse (sort buffer size) for serveren" nla "Geen geheugen om te sorteren. Verhoog de server sort buffer size" - eng "Out of sort memory; increase server sort buffer size" + eng "Out of sort memory, consider increasing server sort buffer size" jps "Out of sort memory. sort buffer size が足りないようです.", est "Mälu sai sorteerimisel otsa. Suurenda MySQL-i sorteerimispuhvrit" fre "Manque de mémoire pour le tri. Augmentez-la." @@ -907,10 +907,10 @@ ER_OUT_OF_SORTMEMORY HY001 S1001 ita "Memoria per gli ordinamenti esaurita. Incrementare il 'sort_buffer' al demone" jpn "Out of sort memory. sort buffer size が足りないようです." kor "Out of sort memory. daemon sort buffer의 크기를 증가시키세요" - nor "Ikke mer sorteringsminne. Øk sorteringsminnet (sort buffer size) for tjenesten" - norwegian-ny "Ikkje meir sorteringsminne. Auk sorteringsminnet (sorteringsbffer storleik) for tenesten" + nor "Ikke mer sorteringsminne. Vurder å øke sorteringsminnet (sort buffer size) for tjenesten" + norwegian-ny "Ikkje meir sorteringsminne. Vurder å auke sorteringsminnet (sorteringsbuffer storleik) for tenesten" pol "Zbyt mało pamięci dla sortowania. Zwiększ wielko?ć bufora demona dla sortowania" - por "Sem memória para ordenação. Aumente tamanho do 'buffer' de ordenação" + por "Não há memória suficiente para ordenação. Considere aumentar o tamanho do retentor (buffer) de ordenação." rum "Out of memory pentru sortare. Largeste marimea buffer-ului pentru sortare in daemon (sort buffer size)" rus "Недостаточно памяти для сортировки. Увеличьте размер буфера сортировки на сервере" serbian "Nema memorije za sortiranje. Povećajte veličinu sort buffer-a MySQL server-u" @@ -6152,7 +6152,7 @@ ER_WARN_ENGINE_TRANSACTION_ROLLBACK ER_SLAVE_HEARTBEAT_FAILURE eng "Unexpected master's heartbeat data: %s" ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE - eng "The requested value for the heartbeat period %s %s" + eng "The requested value for the heartbeat period is either negative or exceeds the maximum allowed (%s seconds)." ER_NDB_REPLICATION_SCHEMA_ERROR eng "Bad schema for mysql.ndb_replication table. Message: %-.64s" @@ -6347,6 +6347,74 @@ ER_FAILED_READ_FROM_PAR_FILE eng "Failed to read from the .par file" swe "Misslyckades läsa från .par filen" +ER_VALUES_IS_NOT_INT_TYPE_ERROR + eng "VALUES value for partition '%-.64s' must have type INT" + swe "Värden i VALUES för partition '%-.64s' måste ha typen INT" + +ER_ACCESS_DENIED_NO_PASSWORD_ERROR 28000 + cze "P-Břístup pro uživatele '%-.48s'@'%-.64s'" + dan "Adgang nægtet bruger: '%-.48s'@'%-.64s'" + nla "Toegang geweigerd voor gebruiker: '%-.48s'@'%-.64s'" + eng "Access denied for user '%-.48s'@'%-.64s'" + est "Ligipääs keelatud kasutajale '%-.48s'@'%-.64s'" + fre "Accès refusé pour l'utilisateur: '%-.48s'@'@%-.64s'" + ger "Benutzer '%-.48s'@'%-.64s' hat keine Zugriffsberechtigung" + greek "Δεν επιτέρεται η πρόσβαση στο χρήστη: '%-.48s'@'%-.64s'" + hun "A(z) '%-.48s'@'%-.64s' felhasznalo szamara tiltott eleres." + ita "Accesso non consentito per l'utente: '%-.48s'@'%-.64s'" + kor "'%-.48s'@'%-.64s' 사용자는 접근이 거부 되었습니다." + nor "Tilgang nektet for bruker: '%-.48s'@'%-.64s'" + norwegian-ny "Tilgang ikke tillate for brukar: '%-.48s'@'%-.64s'" + por "Acesso negado para o usuário '%-.48s'@'%-.64s'" + rum "Acces interzis pentru utilizatorul: '%-.48s'@'%-.64s'" + rus "Доступ закрыт для пользователя '%-.48s'@'%-.64s'" + serbian "Pristup je zabranjen korisniku '%-.48s'@'%-.64s'" + slo "Zakázaný prístup pre užívateľa: '%-.48s'@'%-.64s'" + spa "Acceso negado para usuario: '%-.48s'@'%-.64s'" + swe "Användare '%-.48s'@'%-.64s' är ej berättigad att logga in" + ukr "Доступ заборонено для користувача: '%-.48s'@'%-.64s'" + +ER_SET_PASSWORD_AUTH_PLUGIN + eng "SET PASSWORD has no significance for users authenticating via plugins" + +ER_GRANT_PLUGIN_USER_EXISTS + eng "GRANT with IDENTIFIED WITH is illegal because the user %-.*s already exists" + +ER_TRUNCATE_ILLEGAL_FK 42000 + eng "Cannot truncate a table referenced in a foreign key constraint (%.192s)" + +ER_PLUGIN_IS_PERMANENT + eng "Plugin '%s' is force_plus_permanent and can not be unloaded" + +ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN + eng "The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled." + +ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX + eng "The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout." + +ER_STMT_CACHE_FULL + eng "Multi-row statements required more than 'max_binlog_stmt_cache_size' bytes of storage; increase this mysqld variable and try again" + +ER_MULTI_UPDATE_KEY_CONFLICT + eng "Primary key/partition key update is not allowed since the table is updated both as '%-.192s' and '%-.192s'." + +# When translating this error message make sure to include "ALTER TABLE" in the +# message as mysqlcheck parses the error message looking for ALTER TABLE. +ER_TABLE_NEEDS_REBUILD + eng "Table rebuild required. Please do \"ALTER TABLE `%-.32s` FORCE\" or dump/reload to fix it!" + +WARN_OPTION_BELOW_LIMIT + eng "The value of '%s' should be no less than the value of '%s'" + +ER_INDEX_COLUMN_TOO_LONG + eng "Index column size too large. The maximum column size is %lu bytes." + +ER_ERROR_IN_TRIGGER_BODY + eng "Trigger '%-.64s' has an error in its body: '%-.256s'" + +ER_ERROR_IN_UNKNOWN_TRIGGER_BODY + eng "Unknown trigger has an error in its body: '%-.256s'" + ER_VCOL_BASED_ON_VCOL eng "A computed column cannot be based on a computed column" ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED @@ -6372,4 +6440,3 @@ ER_UNKNOWN_OPTION eng "Unknown option '%-.64s'" ER_BAD_OPTION_VALUE eng "Incorrect value '%-.64s' for option '%-.64s'" - |