summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2005-11-01 19:47:53 +0300
committerunknown <evgen@moonbone.local>2005-11-01 19:47:53 +0300
commit70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e (patch)
tree6c1605103b3513ebad088e2997385997cd4d354f /myisam
parentee380a077782f87d80aae7a8c9c9ead51dfd8e7b (diff)
parent03ed0d1d244de2e97c1ca5749f1677d1dbb07f95 (diff)
downloadmariadb-git-70536ba1b5b4c8e81f71b714112b42ff3fcc3f5e.tar.gz
Manually merged
client/mysqltest.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/update.test: Auto merged sql/item_timefunc.h: Auto merged sql/spatial.cc: Auto merged sql/sql_select.h: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 5e7b8e5a898..6296193d6b0 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1848,7 +1848,7 @@ static int sort_one_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
if (sort_one_index(param,info,keyinfo,next_page,new_file))
{
DBUG_PRINT("error",
- ("From page: %ld, keyoffset: 0x%lx used_length: %d",
+ ("From page: %ld, keyoffset: %lu used_length: %d",
(ulong) pagepos, (ulong) (keypos - buff),
(int) used_length));
DBUG_DUMP("buff",(byte*) buff,used_length);