Merging

mysql-test/r/func_str.result:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

6 files changed, 67 insertions, 11 deletions

diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 0d752b0daf1..4d65515d6ce 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -317,4 +317,5 @@
 #define ER_UNKNOWN_TIME_ZONE 1298
 #define ER_WARN_INVALID_TIMESTAMP 1299
 #define ER_INVALID_CHARACTER_STRING 1300
-#define ER_ERROR_MESSAGES 301
+#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
+#define ER_ERROR_MESSAGES 302
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 1baf9d8e01c..066c9ad0c43 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -225,6 +225,8 @@ substring_index("www.tcx.se","",3)
 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
 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 29bbcf4466f..65b4bb1b6c3 100644
--- a/mysql-test/r/packet.result
+++ b/mysql-test/r/packet.result
@@ -8,6 +8,8 @@ len
 select repeat('a',2000);
 repeat('a',2000)
 NULL
+Warnings:
+Warning	1300	Data truncated by function 'repeat' do to max_allowed_packet
 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 66a223f0ebf..00553737a21 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -446,7 +446,12 @@ String *Item_func_spatial_collection::val_str(String *str)
     }
   }
   if (str->length() > current_thd->variables.max_allowed_packet)
+  {
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
     goto err;
+  }
 
   null_value = 0;
   return str;
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index a8805be7854..0e96b0fcef4 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -266,7 +266,12 @@ String *Item_func_concat::val_str(String *str)
 	continue;
       if (res->length()+res2->length() >
 	  current_thd->variables.max_allowed_packet)
-	goto null;				// Error check
+      {
+	push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			    ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+	goto null;
+      }
       if (res->alloced_length() >= res->length()+res2->length())
       {						// Use old buffer
 	res->append(*res2);
@@ -544,7 +549,12 @@ String *Item_func_concat_ws::val_str(String *str)
 
     if (res->length() + sep_str->length() + res2->length() >
 	current_thd->variables.max_allowed_packet)
-      goto null;				// Error check
+    {
+      push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			  ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			  ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+      goto null;
+    }
     if (res->alloced_length() >=
 	res->length() + sep_str->length() + res2->length())
     {						// Use old buffer
@@ -801,7 +811,14 @@ redo:
           offset= (int) (ptr-res->ptr());
           if (res->length()-from_length + to_length >
 	      current_thd->variables.max_allowed_packet)
+	  {
+	    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+				ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+				ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
+				func_name());
+
             goto null;
+	  }
           if (!alloced)
           {
             alloced=1;
@@ -822,7 +839,12 @@ skip:
     {
       if (res->length()-from_length + to_length >
 	  current_thd->variables.max_allowed_packet)
+      {
+	push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			    ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			    ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
         goto null;
+      }
       if (!alloced)
       {
         alloced=1;
@@ -882,7 +904,12 @@ String *Item_func_insert::val_str(String *str)
     length=res->length()-start;
   if (res->length() - length + res2->length() >
       current_thd->variables.max_allowed_packet)
-    goto null;					// OOM check
+  {
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+    goto null;
+  }
   res=copy_if_not_alloced(str,res,res->length());
   res->replace(start,length,*res2);
   return res;
@@ -1934,7 +1961,12 @@ String *Item_func_repeat::val_str(String *str)
   length=res->length();
   // Safe length check
   if (length > current_thd->variables.max_allowed_packet/count)
-    goto err;				// Probably an error
+  {
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+    goto err;
+  }
   tot_length= length*(uint) count;
   if (!(res= alloc_buffer(res,str,&tmp_value,tot_length)))
     goto err;
@@ -1999,8 +2031,14 @@ String *Item_func_rpad::val_str(String *str)
     return (res);
   }
   pad_char_length= rpad->numchars();
-  if ((ulong) byte_count > current_thd->variables.max_allowed_packet ||
-      args[2]->null_value || !pad_char_length)
+  if ((ulong) byte_count > current_thd->variables.max_allowed_packet)
+  {
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+    goto err;
+  }
+  if(args[2]->null_value || !pad_char_length)
     goto err;
   res_byte_length= res->length();	/* Must be done before alloc_buffer */
   if (!(res= alloc_buffer(res,str,&tmp_value,byte_count)))
@@ -2079,8 +2117,15 @@ String *Item_func_lpad::val_str(String *str)
   pad_char_length= pad->numchars();
   byte_count= count * collation.collation->mbmaxlen;
   
-  if (byte_count > current_thd->variables.max_allowed_packet ||
-      args[2]->null_value || !pad_char_length || str->alloc(byte_count))
+  if (byte_count > current_thd->variables.max_allowed_packet)
+  {
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
+    goto err;
+  }
+
+  if (args[2]->null_value || !pad_char_length || str->alloc(byte_count))
     goto err;
   
   str->length(0);
@@ -2368,7 +2413,9 @@ String *Item_load_file::val_str(String *str)
   }
   if (stat_info.st_size > (long) current_thd->variables.max_allowed_packet)
   {
-    /* my_error(ER_TOO_LONG_STRING, MYF(0), file_name->c_ptr()); */
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+			ER_WARN_ALLOWED_PACKET_OVERFLOWED,
+			ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name());
     goto err;
   }
   if (tmp_value.alloc(stat_info.st_size))
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index a2f4c848217..626816ae72c 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -307,5 +307,4 @@ character-set=latin7
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",
 "Unknown or incorrect time zone: '%-.64s'",
-"Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",