diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 18:50:35 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 18:50:35 +0200 |
| commit | c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca (patch) | |
| tree | fb1bde1c103ee0dcfcc1d97919f424527579c48a /sql/share | |
| parent | 4685004d2a519e70498380b8142ff0b8780ea707 (diff) | |
| download | mariadb-git-c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca.tar.gz | |
Post-merge fixes.
sql/share/errmsg.txt:
Reverting error message to before merge.
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" |