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

21 files changed, 21 insertions, 21 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 3db6120843d..f35eb975b7a 100644
--- a/sql/share/czech/errmsg.txt
+++ b/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'"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 8e42f4a431d..105c138c440 100644
--- a/sql/share/danish/errmsg.txt
+++ b/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'"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index bc88c0b0c89..93dbeab1a5c 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/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'"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index bbb225d0ac4..3f8e5483fef 100644
--- a/sql/share/english/errmsg.txt
+++ b/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'"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index e6141c208a7..706ea858121 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index d08697289fc..7a7c4bbcbe0 100644
--- a/sql/share/french/errmsg.txt
+++ b/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'"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 6c7bc5f43dc..dee216f3bfd 100644
--- a/sql/share/german/errmsg.txt
+++ b/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'"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index eba248b35e7..d5ba8d93cd1 100644
--- a/sql/share/greek/errmsg.txt
+++ b/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'"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 630851d7df1..235d09e760c 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 1bfb8943b58..b5eaabe9824 100644
--- a/sql/share/italian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 103e371a072..a4cb4cd513d 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/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'"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 0d19a458433..091e19e8b71 100644
--- a/sql/share/korean/errmsg.txt
+++ b/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'"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 4b2b8a8f13e..f42eeb93a94 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/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'"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 1e9a16282c4..71e14b3df5b 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index aacc3f425ee..51e23c18dfd 100644
--- a/sql/share/polish/errmsg.txt
+++ b/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'"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index f89726bf128..7a969a6541b 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/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'"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index fbad568c6d1..c53c9b11d0d 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 6ca7ca55e68..18633e0b7be 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/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'"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index e11e1ced60e..5cd9b4f0e26 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/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'"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 618e60bb72c..042df901a5e 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/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'"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 53678dd1ee0..26e00bfbcca 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/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'"