summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-11-10 21:41:05 +0400
committerunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-11-10 21:41:05 +0400
commit243cce823a605fd72d32061760efa8535ef63766 (patch)
treef8eec9d9d3895482f923668dd7603ccea96a41a8 /sql/unireg.cc
parent9e6b13b5f24f22a74bd2a8ca2c008e83cf376c00 (diff)
parent170b1aa738ba4ecb9d58a82951bbab6efced1c32 (diff)
downloadmariadb-git-243cce823a605fd72d32061760efa8535ef63766.tar.gz
Merge mysql.com:/home/ram/work/mysql-5.0-maint
into mysql.com:/home/ram/work/mysql-5.1-maint sql/unireg.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index f9e8e54439a..f8a53bf3f9e 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -469,7 +469,7 @@ static uint pack_keys(uchar *keybuff, uint key_count, KEY *keyinfo,
int2store(pos+6, key->block_size);
pos+=8;
key_parts+=key->key_parts;
- DBUG_PRINT("loop", ("flags: %d key_parts: %d at 0x%lx",
+ DBUG_PRINT("loop", ("flags: %lu key_parts: %d at 0x%lx",
key->flags, key->key_parts,
(long) key->key_part));
for (key_part=key->key_part,key_part_end=key_part+key->key_parts ;