23 files changed, 137 insertions, 45 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 7b5c2cb327a..aa23a7a005a 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -313,6 +313,7 @@ character-set=latin2
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -360,12 +361,15 @@ character-set=latin2
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 7fd0ef6270d..ac66eff0b5f 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -1,4 +1,4 @@
-/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
+:/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
    This file is public domain and comes with NO WARRANTY of any kind */
 
 /* Knud RiishЬjgЕrd knudriis@post.tele.dk 99 &&
@@ -307,6 +307,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -354,12 +355,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 159bace6667..1f85a9ed42f 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -315,6 +315,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -362,12 +363,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 2306df21321..ebf58088c9f 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -304,6 +304,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 03877b4656b..b446f133241 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -309,6 +309,7 @@ character-set=latin7
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -356,12 +357,15 @@ character-set=latin7
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index f1d68fca6d7..db5647abcb6 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -304,6 +304,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 800409bb07f..ae9110ff301 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -316,6 +316,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -363,12 +364,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index b94364d256c..c674d038b16 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -304,6 +304,7 @@ character-set=greek
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=greek
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index b8560317b48..47ff00223af 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -306,6 +306,7 @@ character-set=latin2
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=latin2
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 7c72fb03476..eae07ddefcc 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -304,6 +304,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 4c1bf8e5cc0..5c36473eda8 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -306,6 +306,7 @@ character-set=ujis
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=ujis
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 45479950378..1e1ffbeec20 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -304,6 +304,7 @@ character-set=euckr
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=euckr
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 02096bc46b9..5e6879dd415 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -306,6 +306,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 615014cef94..0f97b65a46f 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -306,6 +306,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 9368dd927d6..aed5d1c5827 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -308,6 +308,7 @@ character-set=latin2
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -355,12 +356,15 @@ character-set=latin2
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 12c4c43bfe0..b2acb008932 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -305,6 +305,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -352,12 +353,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 4b04ef3729e..f065504da5b 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -308,6 +308,7 @@ character-set=latin2
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -355,12 +356,15 @@ character-set=latin2
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index b73b7d8d7b9..56b0b9c8953 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -306,6 +306,7 @@ character-set=koi8r
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=koi8r
 "'%-.64s.%-.64s' - не %s"
 "Столбец '%-.64s' не обновляемый"
 "View SELECT содержит подзапрос в конструкции FROM"
-"View SELECT содержит конструкцию PROCEDURE"
+"View SELECT содержит конструкцию '%s'"
 "View SELECT содержит переменную или параметр" 
 "View SELECT содержит ссылку на временную таблицу '%-.64s'"
 "View SELECT и список полей view имеют разное количество столбцов"
 "Алгоритм слияния view не может быть использован сейчас (алгоритм будет неопеределенным)"
 "Обновляемый view не содержит ключа использованной в нем таблиц(ы)"
+"View '%-.64s.%-.64s' ссылается на несуществующие таблицы или столбцы"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index d0f4e0e64eb..a3ecba11e2e 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -310,6 +310,7 @@ character-set=cp1250
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -357,12 +358,15 @@ character-set=cp1250
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 66f75e5b44d..88be98bb6f4 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -312,6 +312,7 @@ character-set=latin2
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -359,12 +360,15 @@ character-set=latin2
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 080fba045a4..c35a2b9a917 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -306,6 +306,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -353,12 +354,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 0d4e4d489f4..00c3e4b0016 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -304,6 +304,7 @@ character-set=latin1
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -351,12 +352,15 @@ character-set=latin1
 "'%-.64s.%-.64s' is not %s"
 "Column '%-.64s' is not updatable"
 "View's SELECT contains a subquery in the FROM clause"
-"View's SELECT contains a PROCEDURE clause"
+"View's SELECT contains a '%s' clause"
 "View's SELECT contains a variable or parameter" 
 "View's SELECT contains a temporary table '%-.64s'"
 "View's SELECT and view's field list have different column counts"
 "View merge algorithm can't be used here for now (assumed undefined algorithm)"
-"View being update does not have complete key of underlying table in it"
+"View being updated does not have complete key of underlying table in it"
+"View '%-.64s.%-.64s' references invalid table(s) or column(s)"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index a1369730790..c5329fccaea 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -309,6 +309,7 @@ character-set=koi8u
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"
@@ -356,12 +357,15 @@ character-set=koi8u
 "'%-.64s.%-.64s' не ╓ %s"
 "Стовбець '%-.64s' не може бути зминений"
 "View SELECT ма╓ п╕дзапит у конструкц╕╖ FROM"
-"View SELECT ма╓ конструкц╕ю PROCEDURE"
+"View SELECT ма╓ конструкц╕ю '%s'"
 "View SELECT ма╓ зминну або параметер" 
 "View SELECT використову╓ тимчасову таблицю '%-.64s'"
 "View SELECT ╕ перел╕к стовбц╕в view мають р╕зну к╕льк╕сть сковбц╕в"
 "Алгоритм зливання view не може бути використаний зараз (алгоритм буде невизначений)"
 "View, що оновлюеться, не м╕стить повного ключа таблиц╕(ь), що викор╕стана в ньюому"
+"View '%-.64s.%-.64s' посила╓тся на не╕снуюч╕ таблиц╕ або стовбц╕"
+"Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
 "Trigger already exists"
 "Trigger does not exist"
 "Trigger's '%-.64s' is view or temporary table"