database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed.

Browse Source 
typo in error message text corrected.
new tests added


mysql-test/r/func_compress.result:
  new tests added
mysql-test/t/func_compress.test:
  new tests added
sql/item_strfunc.cc:
  max size of uncompressed data is max_allowed_packet not 8K
sql/share/czech/errmsg.txt:
  typo fixed
sql/share/danish/errmsg.txt:
  typo fixed
sql/share/dutch/errmsg.txt:
  typo fixed
sql/share/english/errmsg.txt:
  typo fixed
sql/share/estonian/errmsg.txt:
  typo fixed
sql/share/french/errmsg.txt:
  typo fixed
sql/share/german/errmsg.txt:
  typo fixed
sql/share/greek/errmsg.txt:
  typo fixed
sql/share/hungarian/errmsg.txt:
  typo fixed
sql/share/italian/errmsg.txt:
  typo fixed
sql/share/japanese/errmsg.txt:
  typo fixed
sql/share/korean/errmsg.txt:
  typo fixed
sql/share/norwegian-ny/errmsg.txt:
  typo fixed
sql/share/norwegian/errmsg.txt:
  typo fixed
sql/share/polish/errmsg.txt:
  typo fixed
sql/share/portuguese/errmsg.txt:
  typo fixed
sql/share/romanian/errmsg.txt:
  typo fixed
sql/share/russian/errmsg.txt:
  typo fixed
sql/share/serbian/errmsg.txt:
  typo fixed
sql/share/slovak/errmsg.txt:
  typo fixed
sql/share/spanish/errmsg.txt:
  typo fixed
sql/share/swedish/errmsg.txt:
  typo fixed
sql/share/ukrainian/errmsg.txt:
  typo fixed
This commit is contained in:
unknown
2003-10-12 15:16:45 +02:00
parent b297e76402
commit 1862f67160
26 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/func_compress.result
View File

@ -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;

10
mysql-test/t/func_compress.test
View File

@ -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;

5
sql/item_strfunc.cc
View File

@ -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;
}

4
sql/share/czech/errmsg.txt
View File

@ -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";

4
sql/share/danish/errmsg.txt
View File

@ -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";

4
sql/share/dutch/errmsg.txt
View File

@ -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";

4
sql/share/english/errmsg.txt
View File

@ -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";

4
sql/share/estonian/errmsg.txt
View File

@ -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";

4
sql/share/french/errmsg.txt
View File

@ -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";

4
sql/share/german/errmsg.txt
View File

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

4
sql/share/greek/errmsg.txt
View File

@ -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";

4
sql/share/hungarian/errmsg.txt
View File

@ -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";

4
sql/share/italian/errmsg.txt
View File

@ -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";

4
sql/share/japanese/errmsg.txt
View File

@ -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";

4
sql/share/korean/errmsg.txt
View File

@ -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";

4
sql/share/norwegian-ny/errmsg.txt
View File

@ -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";

4
sql/share/norwegian/errmsg.txt
View File

@ -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";

4
sql/share/polish/errmsg.txt
View File

@ -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";

4
sql/share/portuguese/errmsg.txt
View File

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

4
sql/share/romanian/errmsg.txt
View File

@ -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";

4
sql/share/russian/errmsg.txt
View File

@ -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";

4
sql/share/serbian/errmsg.txt
View File

@ -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";

4
sql/share/slovak/errmsg.txt
View File

@ -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";

4
sql/share/spanish/errmsg.txt
View File

@ -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";

4
sql/share/swedish/errmsg.txt
View File

@ -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";

4
sql/share/ukrainian/errmsg.txt
View File

@ -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";