diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 11:54:25 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 11:54:25 +0200 |
| commit | a18647df1bf9e9a7d546358226ed03c652dd4c43 (patch) | |
| tree | da9a70a4a878c0b88dcc321ecb05e6b5b8d03d6c /sql/share | |
| parent | c2249b8a5902033e02f1a7895a2ecf22c6f56040 (diff) | |
| parent | e538761350e5461fa2efde77d1e094d8d75c2eb4 (diff) | |
| download | mariadb-git-a18647df1bf9e9a7d546358226ed03c652dd4c43.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index d37d8972c49..1dbba191f09 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5522,7 +5522,8 @@ ER_M_BIGGER_THAN_D 42000 S1009 eng "For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.192s')." ger "Für FLOAT(M,D), DOUBLE(M,D) oder DECIMAL(M,D) muss M >= D sein (Feld '%-.192s')" ER_WRONG_LOCK_OF_SYSTEM_TABLE - eng "You can't combine write-locking of system tables with other tables or lock types" + eng "You can't combine write-locking of system '%-.64s.%-.64s' table with other tables" + ger "Sie können Schreibsperren auf der Systemtabelle '%-.64s.%-.64s' nicht mit anderen Tabellen kombinieren" ER_CONNECT_TO_FOREIGN_DATA_SOURCE eng "Unable to connect to foreign data source: %.64s" ger "Kann nicht mit Fremddatenquelle verbinden: %.64s" |