Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

sql/share/czech/errmsg.txt

@@ -348,5 +348,5 @@ character-set=latin2
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/danish/errmsg.txt

@@ -342,5 +342,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/dutch/errmsg.txt

@@ -350,5 +350,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/english/errmsg.txt

@@ -339,5 +339,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/estonian/errmsg.txt

@@ -344,5 +344,5 @@ character-set=latin7
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/french/errmsg.txt

@@ -339,5 +339,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/german/errmsg.txt

@@ -351,5 +351,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/greek/errmsg.txt

@@ -339,5 +339,5 @@ character-set=greek
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/hungarian/errmsg.txt

@@ -341,5 +341,5 @@ character-set=latin2
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/italian/errmsg.txt

@@ -339,5 +339,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/japanese/errmsg.txt

@@ -341,5 +341,5 @@ character-set=ujis
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/korean/errmsg.txt

@@ -339,5 +339,5 @@ character-set=euckr
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/norwegian-ny/errmsg.txt

@@ -341,5 +341,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/norwegian/errmsg.txt

@@ -341,5 +341,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/polish/errmsg.txt

@@ -343,5 +343,5 @@ character-set=latin2
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/portuguese/errmsg.txt

@@ -340,5 +340,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/romanian/errmsg.txt

@@ -343,5 +343,5 @@ character-set=latin2
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/serbian/errmsg.txt

@@ -333,5 +333,5 @@ character-set=cp1250
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/slovak/errmsg.txt

@@ -347,5 +347,5 @@ character-set=latin2
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/spanish/errmsg.txt

@@ -341,5 +341,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"

sql/share/swedish/errmsg.txt

@@ -339,5 +339,5 @@ character-set=latin1
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
 "Unexpected end of file while parsing comment '%-.64s'"
-"Error during parsing parameter '%-.64s' (line: '%-.64s')"
+"Error while parsing parameter '%-.64s' (line: '%-.64s')"
 "Unexpected end of file while skipping unknown parameter '%-.64s'"