summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/func_compress.result20
-rw-r--r--mysql-test/t/func_compress.test10
-rw-r--r--sql/item_strfunc.cc5
-rw-r--r--sql/share/czech/errmsg.txt4
-rw-r--r--sql/share/danish/errmsg.txt4
-rw-r--r--sql/share/dutch/errmsg.txt4
-rw-r--r--sql/share/english/errmsg.txt4
-rw-r--r--sql/share/estonian/errmsg.txt4
-rw-r--r--sql/share/french/errmsg.txt4
-rw-r--r--sql/share/german/errmsg.txt4
-rw-r--r--sql/share/greek/errmsg.txt4
-rw-r--r--sql/share/hungarian/errmsg.txt4
-rw-r--r--sql/share/italian/errmsg.txt4
-rw-r--r--sql/share/japanese/errmsg.txt4
-rw-r--r--sql/share/korean/errmsg.txt4
-rw-r--r--sql/share/norwegian-ny/errmsg.txt4
-rw-r--r--sql/share/norwegian/errmsg.txt4
-rw-r--r--sql/share/polish/errmsg.txt4
-rw-r--r--sql/share/portuguese/errmsg.txt4
-rw-r--r--sql/share/romanian/errmsg.txt4
-rw-r--r--sql/share/russian/errmsg.txt4
-rw-r--r--sql/share/serbian/errmsg.txt4
-rw-r--r--sql/share/slovak/errmsg.txt4
-rw-r--r--sql/share/spanish/errmsg.txt4
-rw-r--r--sql/share/swedish/errmsg.txt4
-rw-r--r--sql/share/ukrainian/errmsg.txt4
26 files changed, 72 insertions, 55 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result
index 57eef44b3bb..85842f28e64 100644
--- a/mysql-test/r/func_compress.result
+++ b/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;
diff --git a/mysql-test/t/func_compress.test b/mysql-test/t/func_compress.test
index 7462c020357..069fbed8562 100644
--- a/mysql-test/t/func_compress.test
+++ b/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;
+
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index c8ee64dc707..55a20908894 100644
--- a/sql/item_strfunc.cc
+++ b/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;
}
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 29d8b255251..e7cc54746b5 100644
--- a/sql/share/czech/errmsg.txt
+++ b/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";
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index d603555727b..379865a775b 100644
--- a/sql/share/danish/errmsg.txt
+++ b/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";
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 53a19464745..ffe76be0d42 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/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";
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index c54f56b2529..c352b143ef1 100644
--- a/sql/share/english/errmsg.txt
+++ b/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";
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 2997a4d4501..657c5a24539 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/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";
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index cd346270ea8..ab7936aff48 100644
--- a/sql/share/french/errmsg.txt
+++ b/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";
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index bbace563bcb..f50169251f7 100644
--- a/sql/share/german/errmsg.txt
+++ b/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",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 31259e9e02f..93f78bf2a93 100644
--- a/sql/share/greek/errmsg.txt
+++ b/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";
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 52dfb702231..f12fbbc938b 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/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";
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 7efca542348..8d44a83ed3b 100644
--- a/sql/share/italian/errmsg.txt
+++ b/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";
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index f7d6d7be29b..dcd3db0d7a9 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/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";
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 654081c6895..363d81e4dea 100644
--- a/sql/share/korean/errmsg.txt
+++ b/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";
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 76f725a9419..e2427327c77 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/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";
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fe15f7c9b8b..7083bd80085 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/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";
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 12e1d539e76..f770b2e3030 100644
--- a/sql/share/polish/errmsg.txt
+++ b/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";
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 49ca7ee5c56..3c265349cdf 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/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";
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 30e87fe3d0a..c1c495d39c3 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/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";
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index b444348612f..572d515453a 100644
--- a/sql/share/russian/errmsg.txt
+++ b/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";
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 32b94548bc5..a81b5f56838 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/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";
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 45e40caedee..6ca9bcecf1c 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/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";
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index bce03456941..62d32757719 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/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";
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 827419d76e7..f06a760bb24 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/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";
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index fcf0c695c29..675e9899d58 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/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";