wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.

typo in error message text corrected.
new tests added

mysql-test/r/func_compress.result

@@ -40,9 +40,21 @@ uncompress(compress(""))
 select uncompressed_length("");
 uncompressed_length("")
 0
-select compress(NULL);
-compress(NULL)
+create table t1 (a text);
+insert t1 values (compress(null)), ('A\0\0\0BBBBBBBB'), (compress(space(50000))), (space(50000));
+select length(a) from t1;
+length(a)
 NULL
-select uncompress(NULL);
-uncompress(NULL)
+12
+76
+50000
+select length(uncompress(a)) from t1;
+length(uncompress(a))
 NULL
+NULL
+50000
+NULL
+Warnings:
+Error	1258	Z_DATA_ERROR: Input data was corrupted for zlib
+Error	1255	Too big size of uncompressed data. The maximum size is 1048576. (probably, length of uncompressed data was corrupted)
+drop table t1;

mysql-test/t/func_compress.test

@@ -24,8 +24,12 @@ select uncompress(compress(""));
 select uncompressed_length("");
 
 #
-# NULL (Bug #1333)
+# errors
 #
 
-select compress(NULL);
-select uncompress(NULL);
+create table t1 (a text);
+insert t1 values (compress(null)), ('A\0\0\0BBBBBBBB'), (compress(space(50000))), (space(50000));
+select length(a) from t1;
+select length(uncompress(a)) from t1;
+drop table t1;
+

sql/item_strfunc.cc

@@ -2609,11 +2609,12 @@ String *Item_func_uncompress::val_str(String *str)
   int err= Z_OK;
   uint code;
 
-  if (new_size > MAX_BLOB_WIDTH)
+  if (new_size > current_thd->variables.max_allowed_packet)
   {
     push_warning_printf(current_thd,MYSQL_ERROR::WARN_LEVEL_ERROR,
 			ER_TOO_BIG_FOR_UNCOMPRESS,
-			ER(ER_TOO_BIG_FOR_UNCOMPRESS),MAX_BLOB_WIDTH);
+			ER(ER_TOO_BIG_FOR_UNCOMPRESS),
+                        current_thd->variables.max_allowed_packet);
     null_value= 0;
     return 0;
   }

sql/share/czech/errmsg.txt

@@ -268,8 +268,8 @@ character-set=latin2
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/danish/errmsg.txt

@@ -262,8 +262,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/dutch/errmsg.txt

@@ -270,8 +270,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/english/errmsg.txt

@@ -259,8 +259,8 @@ character-set=latin1
 "Slave is already running"
 "Slave has already been stopped"
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
-"Z_BUF_ERROR: Not enough memory available for zlib"
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
+"Z_MEM_ERROR: Not enough memory available for zlib"
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
 "Z_DATA_ERROR: Input data was corrupted for zlib"
 "%d line(s) was(were) cut by group_concat()"
 "Record count is fewer than the column count at row %ld";

sql/share/estonian/errmsg.txt

@@ -264,8 +264,8 @@ character-set=latin7
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/french/errmsg.txt

@@ -259,8 +259,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/german/errmsg.txt

@@ -271,8 +271,8 @@ character-set=latin1
 "Slave läuft bereits",
 "Slave wurde bereits angehalten",
 "Unkomprimierte Daten sind zu groß. Die maximale Größe beträgt %d",
-"Z_BUF_ERROR: Für zlib steht nicht genug Speicher zur Verfügung",
-"Z_MEM_ERROR: Im Ausgabepuffer ist nicht genug Platz für zlib vorhanden (wahrscheinlich wurde die Länge der unkomprimierten Daten beschädigt)",
+"Z_MEM_ERROR: Für zlib steht nicht genug Speicher zur Verfügung",
+"Z_BUF_ERROR: Im Ausgabepuffer ist nicht genug Platz für zlib vorhanden (wahrscheinlich wurde die Länge der unkomprimierten Daten beschädigt)",
 "Z_DATA_ERROR: Eingabedaten für zlib beschädigt",
 "%d Zeile(n) durch group_concat() abgeschnitten",
 "Anzahl der Datensätze in Zeile %ld geringer als Anzahl der Spalten",

sql/share/greek/errmsg.txt

@@ -259,8 +259,8 @@ character-set=greek
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/hungarian/errmsg.txt

@@ -261,8 +261,8 @@ character-set=latin2
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/italian/errmsg.txt

@@ -259,8 +259,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/japanese/errmsg.txt

@@ -261,8 +261,8 @@ character-set=ujis
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/korean/errmsg.txt

@@ -259,8 +259,8 @@ character-set=euckr
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/norwegian-ny/errmsg.txt

@@ -261,8 +261,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/norwegian/errmsg.txt

@@ -261,8 +261,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/polish/errmsg.txt

@@ -263,8 +263,8 @@ character-set=latin2
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/portuguese/errmsg.txt

@@ -260,8 +260,8 @@ character-set=latin1
 "O slave já está rodando",
 "O slave já está parado",
 "Tamanho muito grande dos dados des comprimidos. O máximo tamanho é %d. (provavelmente, o comprimento dos dados descomprimidos está corrupto)",
-"Z_BUF_ERROR: Não suficiente memória disponível para zlib",
-"Z_MEM_ERROR: Não suficiente espaço no buffer emissor para zlib (provavelmente, o comprimento dos dados descomprimidos está corrupto)",
+"Z_MEM_ERROR: Não suficiente memória disponível para zlib",
+"Z_BUF_ERROR: Não suficiente espaço no buffer emissor para zlib (provavelmente, o comprimento dos dados descomprimidos está corrupto)",
 "Z_DATA_ERROR: Dados de entrada está corrupto para zlib",
 "%d linha(s) foi(foram) cortada(s) por group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/romanian/errmsg.txt

@@ -263,8 +263,8 @@ character-set=latin2
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/russian/errmsg.txt

@@ -261,8 +261,8 @@ character-set=koi8r
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/serbian/errmsg.txt

@@ -254,8 +254,8 @@ character-set=cp1250
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/slovak/errmsg.txt

@@ -267,8 +267,8 @@ character-set=latin2
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/spanish/errmsg.txt

@@ -261,8 +261,8 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/swedish/errmsg.txt

@@ -259,8 +259,8 @@ character-set=latin1
 "Slaven har redan startat",
 "Slaven har redan stoppat",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d rad(er) kapades av group_concat()",
 "Record count is fewer than the column count at row %ld";

sql/share/ukrainian/errmsg.txt

@@ -264,8 +264,8 @@ character-set=koi8u
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"Z_BUF_ERROR: Not enough memory available for zlib",
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"Z_MEM_ERROR: Not enough memory available for zlib",
+"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Record count is fewer than the column count at row %ld";