bzr commit into mysql-6.0-bugteam branch (Alexey.Kopytov:3315) Bug#44796

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/bugteam/mysql-6.0-bugteam/ based on revid:gshchepa@stripped

 3315 Alexey Kopytov	2009-05-22
      Fixed the incorrect merge to 6.0 in the patch for bug #44796:
      
      Since we can issue errors from SELECT in 6.0, the warning level
      in Item_func_uncompressed_length::val_int() was lowered to
      MYSQL_ERROR::WARN_LEVEL_WARN. 
      modified:
        sql/item_strfunc.cc

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2009-05-21 12:20:18 +0000
+++ b/sql/item_strfunc.cc	2009-05-22 08:59:50 +0000
@@ -3440,7 +3440,7 @@ longlong Item_func_uncompressed_length::
   */
   if (res->length() <= 4)
   {
-    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_ZLIB_Z_DATA_ERROR,
                         ER(ER_ZLIB_Z_DATA_ERROR));
     null_value= 1;