Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

mysql-test/r/partition.result

@@ -7,7 +7,7 @@ drop table t1;
 create table t1 (a int)
 partition by key(a)
 partitions 0.2+e1;
-ERROR 42000: Only normal integers allowed as number here near '0.2+e1' at line 3
+ERROR 42000: Only integers allowed as number here near '0.2+e1' at line 3
 create table t1 (a int)
 partition by key(a)
 partitions -1;
@@ -15,11 +15,11 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 create table t1 (a int)
 partition by key(a)
 partitions 1.5;
-ERROR 42000: Only normal integers allowed as number here near '1.5' at line 3
+ERROR 42000: Only integers allowed as number here near '1.5' at line 3
 create table t1 (a int)
 partition by key(a)
 partitions 1e+300;
-ERROR 42000: Only normal integers allowed as number here near '1e+300' at line 3
+ERROR 42000: Only integers allowed as number here near '1e+300' at line 3
 create table t1 (a int)
 engine = innodb
 partition by key (a);

sql/share/errmsg.txt

@@ -5974,20 +5974,29 @@ ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA
         ger "Trigger knnen nicht auf Systemtabellen erzeugt werden"
 ER_EVENT_RECURSIVITY_FORBIDDEN
         eng "Recursivity of EVENT DDL statements is forbidden when body is present"
+        ger "Rekursivitt von EVENT-DDL-Anweisungen ist unzulssig wenn ein Hauptteil (Body) existiert"
 ER_EVENTS_DB_ERROR
         eng "Cannot proceed because the tables used by events were found damaged at server start"
+        ger "Kann nicht weitermachen, weil die Tabellen, die von Events verwendet werden, beim Serverstart als beschdigt markiert wurden"
 ER_ONLY_INTEGERS_ALLOWED
-        eng "Only normal integers allowed as number here"
+        eng "Only integers allowed as number here"
+        ger "An dieser Stelle sind nur Ganzzahlen zulssig"
 ER_AUTOINC_READ_FAILED
         eng "Failed to read auto-increment value from storage engine"
+        ger "Lesen des Autoincrement-Werts von der Speicher-Engine fehlgeschlagen"
 ER_USERNAME
-	eng "user name"
+        eng "user name"
+        ger "Benutzername"
 ER_HOSTNAME
-	eng "host name"
+        eng "host name"
+        ger "Hostname"
 ER_WRONG_STRING_LENGTH
-	eng "String '%-.70s' is too long for %s (should be no longer than %d)"
+        eng "String '%-.70s' is too long for %s (should be no longer than %d)"
+        ger "String '%-.70s' ist zu lang fr %s (sollte nicht lnger sein als %d)"
 ER_UNSUPORTED_LOG_ENGINE
         eng "This storage engine cannot be used for log tables""
+        ger "Diese Speicher-Engine kann fr Logtabellen nicht verwendet werden"
 ER_BAD_LOG_STATEMENT
         eng "You cannot '%s' a log table if logging is enabled"
+        ger "Sie knnen eine Logtabelle nicht '%s', wenn Loggen angeschaltet ist"