bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3129)

[Tor Didriksen]

#At file:///export/home/didrik/mysqldev-next-mr/next-mr-opt-backporting-br2/ based on revid:tor.didriksen@stripped

 3129 Tor Didriksen	2010-05-05
      backport some more compiler-warning fixes

    modified:
      sql/opt_range.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2010-04-22 12:03:05 +0000
+++ b/sql/opt_range.cc	2010-05-05 11:22:58 +0000
@@ -1176,7 +1176,7 @@ QUICK_SELECT_I::QUICK_SELECT_I()
 QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr,
                                        bool no_alloc, MEM_ROOT *parent_alloc,
                                        bool *create_error)
-  :dont_free(0),free_file(0),cur_range(NULL),last_range(0)
+  :free_file(0),cur_range(NULL),last_range(0),dont_free(0)
 {
   my_bitmap_map *bitmap;
   DBUG_ENTER("QUICK_RANGE_SELECT::QUICK_RANGE_SELECT");
@@ -1260,7 +1260,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT(
       head->set_keyread(FALSE);
       if (free_file)
       {
-        DBUG_PRINT("info", ("Freeing separate handler 0x%lx (free: %d)", (long) file,
+        DBUG_PRINT("info", ("Freeing separate handler %p (free: %d)", file,
                             free_file));
         file->ha_external_lock(current_thd, F_UNLCK);
         file->close();
@@ -1402,7 +1402,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_
   in_ror_merged_scan= 1;
   if (reuse_handler)
   {
-    DBUG_PRINT("info", ("Reusing handler 0x%lx", (long) file));
+    DBUG_PRINT("info", ("Reusing handler %p", file));
     if (init() || reset())
     {
       DBUG_RETURN(1);
@@ -2321,7 +2321,6 @@ int SQL_SELECT::test_quick_select(THD *t
   keys_to_use.intersect(head->keys_in_use_for_query);
   if (!keys_to_use.is_clear_all())
   {
-    uchar buff[STACK_BUFF_ALLOC];
     MEM_ROOT alloc;
     SEL_TREE *tree= NULL;
     KEY_PART *key_parts;
@@ -8300,6 +8299,7 @@ FT_SELECT *get_ft_select(THD *thd, TABLE
     return fts;
 }
 
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 static bool
 key_has_nulls(const KEY* key_info, const uchar *key, uint key_len)
 {
@@ -8317,6 +8317,7 @@ key_has_nulls(const KEY* key_info, const
   }
   return FALSE;
 }
+#endif
 
 /*
   Create quick select from ref/ref_or_null scan.
@@ -11734,7 +11735,7 @@ static void print_sel_tree(PARAM *param,
   if (!tmp.length())
     tmp.append(STRING_WITH_LEN("(empty)"));
 
-  DBUG_PRINT("info", ("SEL_TREE: 0x%lx (%s)  scans: %s", (long) tree, msg, tmp.ptr()));
+  DBUG_PRINT("info", ("SEL_TREE: %p (%s)  scans: %s", tree, msg, tmp.ptr()));
 
   DBUG_VOID_RETURN;
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]