bk commit into 5.0 tree (serg:1.2049)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2049 05/12/02 23:01:21 serg@stripped +1 -0
  german error messages

  sql/share/errmsg.txt
    1.62 05/12/02 23:01:07 serg@stripped +8 -5
    german error messages

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.61/sql/share/errmsg.txt	Thu Nov 24 01:36:25 2005
+++ 1.62/sql/share/errmsg.txt	Fri Dec  2 23:01:07 2005
@@ -4590,7 +4590,7 @@ ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 210
 	nla "De gebruikte SELECT commando's hebben een verschillend aantal kolommen"
 	eng "The used SELECT statements have a different number of columns"
 	est "Tulpade arv kasutatud SELECT lausetes ei kattu"
 	ita "La SELECT utilizzata ha un numero di colonne differente"
@@ -5274,7 +5274,7 @@ ER_VIEW_SELECT_TMPTABLE  
 ER_VIEW_WRONG_LIST  
 	eng "View's SELECT and view's field list have different column counts"
-	ger "SELECT- und Feldliste der Views haben eine unterschiedliche Anzahl von Spalten"
+	ger "SELECT- und Feldliste der Views haben unterschiedliche Anzahlen von Spalten"
 ER_WARN_VIEW_MERGE  
@@ -5485,7 +5485,7 @@ ER_CANT_CREATE_GEOMETRY_OBJECT 22003 
 ER_FAILED_ROUTINE_BREAK_BINLOG
 	eng "A routine failed and has neither NO SQL nor READS SQL DATA in its declaration and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes"
 ER_BINLOG_UNSAFE_ROUTINE
 	eng "This function has none of DETERMINISTIC, NO SQL, or READS SQL DATA in its declaration and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
@@ -5595,8 +5595,11 @@ ER_SP_BAD_VAR_SHADOW 42000
 	eng "Variable '%-.64s' must be quoted with `...`, or renamed"
 ER_TRG_NO_DEFINER
-  eng "No definer attribute for trigger '%-.64s'.'%-.64s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."
+        eng "No definer attribute for trigger '%-.64s'.'%-.64s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."
 ER_OLD_FILE_FORMAT
-  eng "'%-.64s' has an old format, you should re-create the '%s' object(s)"
+        eng "'%-.64s' has an old format, you should re-create the '%s' object(s)"
+        ger "'%-.64s' hat altes Format, Sie sollten die '%s'-Objekt(e) neu erzeugen"
 ER_SP_RECURSION_LIMIT
         eng "Recursive limit %d (as set by the max_sp_recursion_depth variable) was exceeded for routine %.64s"