Final patch for WL#1600(warn if max_allowed_packet used)

mysql-test/r/func_str.result:
  test fixed
mysql-test/r/packet.result:
  test fixed
sql/item_geofunc.cc:
  error message fixed
sql/item_strfunc.cc:
  error message fixed
sql/share/czech/errmsg.txt:
  error message fixed
sql/share/danish/errmsg.txt:
  error message fixed
sql/share/dutch/errmsg.txt:
  error message fixed
sql/share/english/errmsg.txt:
  error message fixed
sql/share/estonian/errmsg.txt:
  error message fixed
sql/share/french/errmsg.txt:
  error message fixed
sql/share/german/errmsg.txt:
  error message fixed
sql/share/greek/errmsg.txt:
  error message fixed
sql/share/hungarian/errmsg.txt:
  error message fixed
sql/share/italian/errmsg.txt:
  error message fixed
sql/share/japanese/errmsg.txt:
  error message fixed
sql/share/korean/errmsg.txt:
  error message fixed
sql/share/norwegian-ny/errmsg.txt:
  error message fixed
sql/share/norwegian/errmsg.txt:
  error message fixed
sql/share/polish/errmsg.txt:
  error message fixed
sql/share/portuguese/errmsg.txt:
  error message fixed
sql/share/romanian/errmsg.txt:
  error message fixed
sql/share/russian/errmsg.txt:
  error message fixed
sql/share/serbian/errmsg.txt:
  error message fixed
sql/share/slovak/errmsg.txt:
  error message fixed
sql/share/spanish/errmsg.txt:
  error message fixed
sql/share/swedish/errmsg.txt:
  error message fixed
sql/share/ukrainian/errmsg.txt:
  error message fixed

27 files changed, 45 insertions, 12 deletions

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 066c9ad0c43..e07ee4f0add 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -226,7 +226,7 @@ select length(repeat("a",100000000)),length(repeat("a",1000*64));
 length(repeat("a",100000000))	length(repeat("a",1000*64))
 NULL	64000
 Warnings:
-Warning	1300	Data truncated by function 'repeat' do to max_allowed_packet
+Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select position("0" in "baaa" in (1)),position("0" in "1" in (1,2,3)),position("sql" in ("mysql"));
 position("0" in "baaa" in (1))	position("0" in "1" in (1,2,3))	position("sql" in ("mysql"))
 1	0	3
diff --git a/mysql-test/r/packet.result b/mysql-test/r/packet.result
index 65b4bb1b6c3..dfb5595e02d 100644
--- a/mysql-test/r/packet.result
+++ b/mysql-test/r/packet.result
@@ -9,7 +9,7 @@ select repeat('a',2000);
 repeat('a',2000)
 NULL
 Warnings:
-Warning	1300	Data truncated by function 'repeat' do to max_allowed_packet
+Warning	1301	Result of repeat() was larger than max_allowed_packet (1024) - truncated
 select @@net_buffer_length, @@max_allowed_packet;
 @@net_buffer_length	@@max_allowed_packet
 1024	1024
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 00553737a21..9d58cc37c2a 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -449,7 +449,8 @@ String *Item_func_spatial_collection::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto err;
   }
 
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 0e96b0fcef4..d3493e1fad1 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -269,7 +269,8 @@ String *Item_func_concat::val_str(String *str)
       {
 	push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			    ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
+			    current_thd->variables.max_allowed_packet);
 	goto null;
       }
       if (res->alloced_length() >= res->length()+res2->length())
@@ -552,7 +553,8 @@ String *Item_func_concat_ws::val_str(String *str)
     {
       push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			  ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			  ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			  ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
+			  current_thd->variables.max_allowed_packet);
       goto null;
     }
     if (res->alloced_length() >=
@@ -815,7 +817,8 @@ redo:
 	    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 				ER_WARN_ALLOWED_PACKET_OVERFLOWED,
 				ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
-				func_name());
+				func_name(),
+				current_thd->variables.max_allowed_packet);
 
             goto null;
 	  }
@@ -842,7 +845,8 @@ skip:
       {
 	push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			    ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
+			    current_thd->variables.max_allowed_packet);
         goto null;
       }
       if (!alloced)
@@ -907,7 +911,8 @@ String *Item_func_insert::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto null;
   }
   res=copy_if_not_alloced(str,res,res->length());
@@ -1964,7 +1969,8 @@ String *Item_func_repeat::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto err;
   }
   tot_length= length*(uint) count;
@@ -2035,7 +2041,8 @@ String *Item_func_rpad::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto err;
   }
   if(args[2]->null_value || !pad_char_length)
@@ -2121,7 +2128,8 @@ String *Item_func_lpad::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto err;
   }
 
@@ -2415,7 +2423,8 @@ String *Item_load_file::val_str(String *str)
   {
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
-			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+			func_name(), current_thd->variables.max_allowed_packet);
     goto err;
   }
   if (tmp_value.alloc(stat_info.st_size))
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 3cc665f0597..b62911b8090 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -313,3 +313,4 @@ 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"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 7b42d47f008..07c6c422465 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -307,3 +307,4 @@ 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"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index ce1d06d4356..1b133ba6cf5 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -315,3 +315,4 @@ 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"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index b8b4cd1127d..40024bada59 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 626816ae72c..3b8cd1a0876 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -308,3 +308,4 @@ character-set=latin7
 "Got temporary error %d '%-.100s' from %s",
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 7b3497ead2b..3d770eaff71 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 75732b3f732..63afe6f6e5d 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -316,3 +316,4 @@ 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"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 3825240927a..58587a4ff38 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index eb968dd3a27..3d5284dfa1a 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 7112bcce5f2..1ae152fff8f 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 005f85c6ad7..012f6693e6f 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index a1b6a6c2654..65146fb6578 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 52f1a4ec12c..3825b0c84a7 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fadcc203c37..dd0f0a4c6cb 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index bac2e0678a8..9d61a0efed5 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -308,3 +308,4 @@ 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"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 9e5988490b3..68784bc7be8 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -305,3 +305,4 @@ 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"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 29dd9eb022a..8272ada205b 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -308,3 +308,4 @@ 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"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 7cbbd6e36b8..3f567f88c46 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index c45df8bfbe9..a4c8ea3713a 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -310,3 +310,4 @@ 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"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index f94bb70d9e8..fbcaeab526f 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -312,3 +312,4 @@ 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"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 68488528309..ebdfeba1be2 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -306,3 +306,4 @@ 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"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 6bb2ede2cb1..53abfb238c3 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -304,3 +304,4 @@ 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"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index e16b4ef64d6..2267b497673 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -309,3 +309,4 @@ 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"