summaryrefslogtreecommitdiff
path: root/mysys/my_compress.c
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2007-07-30 11:33:50 +0300
committermonty@mysql.com/nosik.monty.fi <>2007-07-30 11:33:50 +0300
commitb16289a5e05397211fd47e05ce08fe12f93ec38a (patch)
treeb1f9aa6b9e6bcbc36eded4aeb066d360e7541e72 /mysys/my_compress.c
parenta33c863ffd1e0de7bf72a590a90ee5c50180a677 (diff)
downloadmariadb-git-b16289a5e05397211fd47e05ce08fe12f93ec38a.tar.gz
Slow query log to file now displays queries with microsecond precission
--long-query-time is now given in seconds with microseconds as decimals --min_examined_row_limit added for slow query log long_query_time user variable is now double with 6 decimals Added functions to get time in microseconds Added faster time() functions for system that has gethrtime() (Solaris) We now do less time() calls. Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers set_var.cc and my_getopt() can now handle DOUBLE variables. All time() calls changed to my_time() my_time() now does retry's if time() call fails. Added debug function for stopping in mysql_admin_table() when tables are locked Some trivial function and struct variable renames to avoid merge errors. Fixed compiler warnings Initialization of some time variables on windows moved to my_init()
Diffstat (limited to 'mysys/my_compress.c')
-rw-r--r--mysys/my_compress.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c
index d495a1c1c6d..bc9f8317487 100644
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.c
@@ -154,17 +154,20 @@ my_bool my_uncompress(uchar *packet, size_t len, size_t *complen)
SYNOPSIS
packfrm()
- data Data reference to frm file data
+ data Data reference to frm file data.
len Length of frm file data
out:pack_data Reference to the pointer to the packed frm data
out:pack_len Length of packed frm file data
+ NOTES
+ data is replaced with compressed content
+
RETURN VALUES
0 Success
>0 Failure
*/
-int packfrm(const uchar *data, size_t len,
+int packfrm(uchar *data, size_t len,
uchar **pack_data, size_t *pack_len)
{
int error;
@@ -178,8 +181,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_DUMP("compressed", (char*)data, org_len);
+ DBUG_PRINT("info", ("org_len: %lu comp_len: %lu", (ulong) org_len, (ulong) comp_len));
+ DBUG_DUMP("compressed", data, org_len);
error= 2;
blob_len= BLOB_HEADER + org_len;
@@ -235,7 +238,7 @@ int unpackfrm(uchar **unpack_data, size_t *unpack_len,
complen= uint4korr(pack_data+8);
DBUG_PRINT("blob",("ver: %lu complen: %lu orglen: %lu",
- ver, complen, orglen));
+ ver, (ulong) complen, (ulong) orglen));
DBUG_DUMP("blob->data", pack_data + BLOB_HEADER, complen);
if (ver != 1)