diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
| commit | 886965303155d1c2fbd90e3606fd192d4ba7741b (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /sql/sql_class.h | |
| parent | daaddeb656c26c685962fef69d19e7f264620e2b (diff) | |
| parent | 14decc4fbc04b8ce0c5efb7d76b711c6e60a0266 (diff) | |
| download | mariadb-git-886965303155d1c2fbd90e3606fd192d4ba7741b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/ctype_ucs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c7bdfbd7ea7..2467385b679 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2084,7 +2084,7 @@ public: inline bool unique_add(void *ptr) { DBUG_ENTER("unique_add"); - DBUG_PRINT("info", ("tree %u - %u", tree.elements_in_tree, max_elements)); + DBUG_PRINT("info", ("tree %u - %lu", tree.elements_in_tree, max_elements)); if (tree.elements_in_tree > max_elements && flush()) DBUG_RETURN(1); DBUG_RETURN(!tree_insert(&tree, ptr, 0, tree.custom_arg)); |