diff options
author | mkindahl@dl145h.mysql.com <> | 2008-04-01 18:50:35 +0200 |
---|---|---|
committer | mkindahl@dl145h.mysql.com <> | 2008-04-01 18:50:35 +0200 |
commit | 013fd236755ec402a988eaa70392e0a08c169ac0 (patch) | |
tree | fb1bde1c103ee0dcfcc1d97919f424527579c48a /sql/share | |
parent | 46af32984898beae9ec535b6f6467776ac16f6e4 (diff) | |
download | mariadb-git-013fd236755ec402a988eaa70392e0a08c169ac0.tar.gz |
Post-merge fixes.
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 1dbba191f09..894e2094968 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5522,8 +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 '%-.64s.%-.64s' table with other tables" - ger "Sie können Schreibsperren auf der Systemtabelle '%-.64s.%-.64s' nicht mit anderen Tabellen kombinieren" + eng "You can't combine write-locking of system tables with other tables or lock types" + ger "Sie können Schreibsperren auf der Systemtabelle 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" |