diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-25 12:12:10 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-25 12:12:10 +0300 |
| commit | 6e49a48a25465eeb8e9e4c6b510b78ed508242bc (patch) | |
| tree | 35df7c393bd1aad9429105b0c5c3e2ec42262947 | |
| parent | 8d6634c9e0c43b2d4ed2b0cc9f90b66c850855ab (diff) | |
| parent | b31dd53c853179e5c4d84cd7f7eeb9b09ca3cbbf (diff) | |
| download | mariadb-git-6e49a48a25465eeb8e9e4c6b510b78ed508242bc.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
myisam/mi_check.c:
Auto merged
| -rw-r--r-- | myisam/mi_check.c | 7 | ||||
| -rw-r--r-- | myisam/mi_delete.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index ef384c4bcc6..8783a5fef54 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1838,9 +1838,10 @@ static int sort_one_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, _mi_kpointer(info,keypos-nod_flag,param->new_file_pos); /* Save new pos */ if (sort_one_index(param,info,keyinfo,next_page,new_file)) { - DBUG_PRINT("error",("From page: %ld, keyoffset: %d used_length: %d", - (ulong) pagepos, (int) (keypos - buff), - (int) used_length)); + DBUG_PRINT("error", + ("From page: %ld, keyoffset: 0x%lx used_length: %d", + (ulong) pagepos, (ulong) (keypos - buff), + (int) used_length)); DBUG_DUMP("buff",(byte*) buff,used_length); goto err; } diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index b964cb35dd8..833223221ec 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -390,7 +390,8 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, MYISAM_SHARE *share=info->s; MI_KEY_PARAM s_temp; DBUG_ENTER("del"); - DBUG_PRINT("enter",("leaf_page: %ld keypos: %lx",leaf_page,keypos)); + DBUG_PRINT("enter",("leaf_page: %ld keypos: 0x%lx", leaf_page, + (ulong) keypos)); DBUG_DUMP("leaf_buff",(byte*) leaf_buff,mi_getint(leaf_buff)); endpos=leaf_buff+mi_getint(leaf_buff); @@ -495,7 +496,8 @@ static int underflow(register MI_INFO *info, register MI_KEYDEF *keyinfo, MI_KEY_PARAM s_temp; MYISAM_SHARE *share=info->s; DBUG_ENTER("underflow"); - DBUG_PRINT("enter",("leaf_page: %ld keypos: %lx",(long) leaf_page,keypos)); + DBUG_PRINT("enter",("leaf_page: %ld keypos: 0x%lx",(long) leaf_page, + (ulong) keypos)); DBUG_DUMP("anc_buff",(byte*) anc_buff,mi_getint(anc_buff)); DBUG_DUMP("leaf_buff",(byte*) leaf_buff,mi_getint(leaf_buff)); |