Commit 3f174f66 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
parents 354f4d4c fb9e8ed5

sql/share/errmsg.txt

+2 −1
Original line number Diff line number Diff line
@@ -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 "Fr 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 knnen 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"