Merge rama.(none):/home/jimw/my/mysql-4.1-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
include/my_sys.h:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/opt_range.cc:
  Resolve conflict
sql/sql_acl.cc:
  Resolve conflict

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 6189d0412b3..5c8a2877ba6 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -5562,8 +5562,9 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
       ulong count=count_key_part_usage(root,pos->next_key_part);
       if (count > pos->next_key_part->use_count)
       {
-	sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu should be %lu",
-			pos,pos->next_key_part->use_count,count);
+        sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu "
+                              "should be %lu", (long unsigned int)pos,
+                              pos->next_key_part->use_count, count);
 	return;
       }
       pos->next_key_part->test_use_count(root);
@@ -5571,7 +5572,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
   }
   if (e_count != elements)
     sql_print_warning("Wrong use count: %u (should be %u) for tree at 0x%lx",
-		    e_count, elements, (gptr) this);
+                      e_count, elements, (long unsigned int) this);
 }
 
 #endif