diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-11-03 22:48:03 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-11-03 22:48:03 +0200 |
| commit | 30c97ed1755b50f14f294108d93bd37d2094010c (patch) | |
| tree | 68c6948d4fbd18bb59fa1aeafdce4a07a41b835f /mysql-test/r/func_compress.result | |
| parent | 78ee8de22df90d4c0d21887c67e0d0e51b210727 (diff) | |
| parent | 4cb95b8dfdcd511d9e3f0a164747a5181686d2c7 (diff) | |
| download | mariadb-git-30c97ed1755b50f14f294108d93bd37d2094010c.tar.gz | |
Merge
BitKeeper/etc/ignore:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-bin.c:
Auto merged
include/mysqld_error.h:
Merge error messages
mysql-test/r/date_formats.result:
merge
sql/derror.cc:
Fixed wront return value
sql/item_timefunc.cc:
merge
sql/item_timefunc.h:
merge
sql/mysqld.cc:
merge
sql/share/czech/errmsg.txt:
Merge error messages
sql/share/danish/errmsg.txt:
Merge error messages
sql/share/dutch/errmsg.txt:
Merge error messages
sql/share/english/errmsg.txt:
Merge error messages
sql/share/estonian/errmsg.txt:
Merge error messages
sql/share/french/errmsg.txt:
Merge error messages
sql/share/german/errmsg.txt:
Merge error messages
sql/share/greek/errmsg.txt:
Merge error messages
sql/share/hungarian/errmsg.txt:
Merge error messages
sql/share/italian/errmsg.txt:
Merge error messages
sql/share/japanese/errmsg.txt:
Merge error messages
sql/share/korean/errmsg.txt:
Merge error messages
sql/share/norwegian-ny/errmsg.txt:
Merge error messages
sql/share/norwegian/errmsg.txt:
Merge error messages
sql/share/polish/errmsg.txt:
Merge error messages
sql/share/portuguese/errmsg.txt:
Merge error messages
sql/share/romanian/errmsg.txt:
Merge error messages
sql/share/russian/errmsg.txt:
Merge error messages
sql/share/serbian/errmsg.txt:
Merge error messages
sql/share/slovak/errmsg.txt:
Merge error messages
sql/share/spanish/errmsg.txt:
Merge error messages
sql/share/swedish/errmsg.txt:
Merge error messages
sql/share/ukrainian/errmsg.txt:
Merge error messages
Diffstat (limited to 'mysql-test/r/func_compress.result')
| -rw-r--r-- | mysql-test/r/func_compress.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 0e46f7dd16d..461fc1018c1 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -65,6 +65,6 @@ NULL 50000 NULL Warnings: -Error 1258 Z_DATA_ERROR: Input data was corrupted for zlib +Error 1258 ZLIB: 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; |