diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
| commit | 49e3024c1a1e950e0fe9fecbccfd13c9728a5b82 (patch) | |
| tree | 2e5fd2ea8d04d6274f3da86ac5b02bed3f38bb8a /mysys/tree.c | |
| parent | cadef27521616ba6caea1556ae053a09e3bde6d8 (diff) | |
| parent | 4b13e338241778aefad46fde158a4cb99db083e1 (diff) | |
| download | mariadb-git-49e3024c1a1e950e0fe9fecbccfd13c9728a5b82.tar.gz | |
Merge 192.168.0.5:mysql/mysql-5.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys/tree.c')
| -rw-r--r-- | mysys/tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/tree.c b/mysys/tree.c index 0c9c04919b0..abbc99b2445 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -89,7 +89,7 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, tree_element_free free_element, void *custom_arg) { DBUG_ENTER("init_tree"); - DBUG_PRINT("enter",("tree: 0x%lx size: %d",tree,size)); + DBUG_PRINT("enter",("tree: 0x%lx size: %d", (long) tree, size)); if (default_alloc_size < DEFAULT_ALLOC_SIZE) default_alloc_size= DEFAULT_ALLOC_SIZE; @@ -137,7 +137,7 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, static void free_tree(TREE *tree, myf free_flags) { DBUG_ENTER("free_tree"); - DBUG_PRINT("enter",("tree: 0x%lx",tree)); + DBUG_PRINT("enter",("tree: 0x%lx", (long) tree)); if (tree->root) /* If initialized */ { |