diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:33:43 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 18:33:43 +0300 |
| commit | ebd53ca2e62f85422afe1be0d57eb7aed1642bb1 (patch) | |
| tree | 623b353a97b3365385e155d0555fb04f42e8a802 /mysys/my_compress.c | |
| parent | d4e6d4b2c1fba6d198c1f02967dd1b038a092068 (diff) | |
| parent | 1ea806b1748c4ffc0904021d7d1e938fe837d73e (diff) | |
| download | mariadb-git-ebd53ca2e62f85422afe1be0d57eb7aed1642bb1.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into labbari.dsl.inet.fi:/home/my/bk/mysql-maria.prod
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_open.c:
Merged with main 5.1.
Diffstat (limited to 'mysys/my_compress.c')
| -rw-r--r-- | mysys/my_compress.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index d495a1c1c6d..5e770959105 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -178,7 +178,8 @@ int packfrm(const uchar *data, size_t len, if (my_compress((uchar*)data, &org_len, &comp_len)) goto err; - DBUG_PRINT("info", ("org_len: %lu comp_len: %lu", org_len, comp_len)); + DBUG_PRINT("info", ("org_len: %lu comp_len: %lu", (ulong) org_len, + (ulong) comp_len)); DBUG_DUMP("compressed", (char*)data, org_len); error= 2; |