From 9182079c5ff5081f6889a765e16a102610a77863 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 25 Apr 2011 17:22:25 +0200
Subject: lots of post-merge changes

---
 sql/sql_bitmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_bitmap.h')

diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index cd3442d306c..0449611e27a 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -157,7 +157,7 @@ public:
   bool is_subset(const Bitmap<64>& map2) const { return !(map & ~map2.map); }
   bool is_overlapping(const Bitmap<64>& map2) const { return (map & map2.map)!= 0; }
   bool operator==(const Bitmap<64>& map2) const { return map == map2.map; }
-  char *print(char *buf) const { longlong2str(map,buf,16,1); return buf; }
+  char *print(char *buf) const { longlong2str(map,buf,16); return buf; }
   ulonglong to_ulonglong() const { return map; }
   class Iterator : public Table_map_iterator
   {
-- 
cgit v1.2.1