diff options
| author | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
| commit | e18b7ea95942cb8ab0b31d453929dde50dcf3756 (patch) | |
| tree | e2b882265e31ada44f3adec357920530f0c0ac31 /sql/share/german/errmsg.txt | |
| parent | c92b5349701ba68fa7ab97abf14933de8d6352fe (diff) | |
| parent | 33efc9677d6f6a68d3dba69f4c036856ac4af5fe (diff) | |
| download | mariadb-git-e18b7ea95942cb8ab0b31d453929dde50dcf3756.tar.gz | |
Merge on pull
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/func_in.result:
Auto merged
Diffstat (limited to 'sql/share/german/errmsg.txt')
| -rw-r--r-- | sql/share/german/errmsg.txt | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index c28792cc8c6..9bd7665ac97 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -1,6 +1,20 @@ -/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB - This file is public domain and comes with NO WARRANTY of any kind +/* 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; either version 2 of the License, or + (at your option) any later version. + + 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 */ + +/* Dirk Munzinger (dmun@4t2.com) 2001-06-07 @@ -11,7 +25,7 @@ Stefan Hinz (stefan@mysql.com) 2003-10-01 - */ +*/ character-set=latin1 @@ -91,7 +105,7 @@ character-set=latin1 "BLOB-Feld '%-.64s' kann beim verwendeten Tabellentyp nicht als Schlüssel verwendet werden", "Feldlänge für Feld '%-.64s' zu groß (maximal %d). BLOB-Feld verwenden!", "Falsche Tabellendefinition. Es darf nur ein Auto-Feld geben und dieses muss als Schlüssel definiert werden", -"%-.64s: Bereit für Verbindungen\n", +"%-.64s: Bereit für Verbindungen", "%-.64s: Normal heruntergefahren\n", "%-.64s: Signal %d erhalten. Abbruch!\n", "%-.64s: Heruntergefahren (shutdown)\n", @@ -316,7 +330,8 @@ character-set=latin1 "Unknown or incorrect time zone: '%-.64s'", "Invalid TIMESTAMP value in column '%s' at row %ld", "Invalid %s character string: '%.64s'", -"Result of %s() was larger than max_allowed_packet (%d) - truncated" +"Result of %s() was larger than max_allowed_packet (%ld) - truncated" +"Conflicting declarations: '%s%s' and '%s%s'" "Can't create a %s from within another stored routine" "%s %s already exists" "%s %s does not exist" |