From: Ole John Aske
Date: March 17 2011 1:20pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3449)
List-Archive: http://lists.mysql.com/commits/133212
Message-Id: <20110317132050.B1008223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2272648628354708245=="

--===============2272648628354708245==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:ole.john.aske@stripped

 3449 Ole John Aske	2011-03-17
      SPJ: Fixed compiler warnings and MTR failures from last commit

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-17 12:25:32 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-17 13:20:46 +0000
@@ -907,7 +907,7 @@ ha_ndbcluster::check_if_pushable(const N
   }
 
   const NdbQueryOperationDef* const root_operation= 
-    m_pushed_join_member->get_query_def().getQueryOperation(PUSHED_ROOT);
+    m_pushed_join_member->get_query_def().getQueryOperation((uint)PUSHED_ROOT);
 
   const NdbQueryOperationTypeWrapper& query_def_type=  
     root_operation->getType();
@@ -1022,7 +1022,7 @@ ha_ndbcluster::create_pushed_join(NdbQue
               m_pushed_join_member->get_operation_count(),
               m_pushed_join_member->get_table(0)->alias,
               NdbQueryOperationDef::getTypeName(
-                m_pushed_join_member->get_query_def().getQueryOperation(PUSHED_ROOT)->getType()))
+                m_pushed_join_member->get_query_def().getQueryOperation((uint)PUSHED_ROOT)->getType()))
              );
 
   // There may be referrences to Field values from tables outside the scope of
@@ -1167,7 +1167,7 @@ ha_ndbcluster::test_push_flag(enum ha_pu
     }
     const NdbQueryDef& query_def = m_pushed_join_member->get_query_def();
     const NdbQueryOperationTypeWrapper& root_type=
-      query_def.getQueryOperation(PUSHED_ROOT)->getType();
+      query_def.getQueryOperation((uint)PUSHED_ROOT)->getType();
 
     /**
      * Primary key/ unique key lookup is always 'ordered' wrt. itself.
@@ -4706,7 +4706,7 @@ int ha_ndbcluster::ordered_index_scan(co
       DBUG_RETURN(error);
 
     NdbQuery* const query= m_active_query;
-    if (sorted && query->getQueryOperation(PUSHED_ROOT)
+    if (sorted && query->getQueryOperation((uint)PUSHED_ROOT)
                        ->setOrdering(descending ? NdbQueryOptions::ScanOrdering_descending
                                                 : NdbQueryOptions::ScanOrdering_ascending))
     {
@@ -6856,7 +6856,7 @@ int ha_ndbcluster::read_range_first_to_b
 
   if (m_use_partition_pruning)
   {
-    DBUG_ASSERT(!m_pushed_join_operation != PUSHED_ROOT);
+    DBUG_ASSERT(m_pushed_join_operation != PUSHED_ROOT);
     get_partition_set(table, buf, active_index, start_key, &part_spec);
     DBUG_PRINT("info", ("part_spec.start_part: %u  part_spec.end_part: %u",
                         part_spec.start_part, part_spec.end_part));
@@ -13974,7 +13974,7 @@ ha_ndbcluster::read_multi_range_first(KE
 
           NdbQuery* const query= m_active_query;
           if (sorted &&
-              query->getQueryOperation(PUSHED_ROOT)->setOrdering(NdbQueryOptions::ScanOrdering_ascending))
+              query->getQueryOperation((uint)PUSHED_ROOT)->setOrdering(NdbQueryOptions::ScanOrdering_ascending))
             ERR_RETURN(query->getNdbError());
         }
       } // check_if_pushable()

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-03-17 12:25:32 +0000
+++ b/sql/ha_ndbcluster.h	2011-03-17 13:20:46 +0000
@@ -940,7 +940,7 @@ private:
   const class ndb_pushed_join
        *m_pushed_join_member;            // Pushed join def. I am member of
   int m_pushed_join_operation;           // Op. id. in above pushed join
-  static const uint PUSHED_ROOT= 0;      // Op. id. if I'm root
+  static const int PUSHED_ROOT= 0;       // Op. id. if I'm root
 
   bool m_disable_pushed_join;            // Pushed execution allowed?
   NdbQuery* m_active_query;              // Pushed query instance executing


--===============2272648628354708245==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   140szwytuvl63q0g
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: a4cbb0e0b7488bd6ab57e0ef8d8b3d1e0cbd7a6a
# timestamp: 2011-03-17 14:20:50 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   g2p0ly3ta03hzak3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTKrvoEAAobfgFgUceP//3fz
/gC////wUAV4vaOgrc9PeGolaASSEIGmin6GSeianpgFPKaep6T0TRkAejUCUUp+qY9oqeNE9RqA
A0AAAAAABppCaKepsaU9IZiQDQAADTQ2oeoAMpQ0000yBoxNAAGQGmQAAaAEkhDU2hMTE0U8Jonk
EnpHqNDTRoHlDR6jkFWG2asgqb7s2udFsmNEdItbJdOAAFgyaRXIXuklayERCIFAgUuzR58Y8htg
ohJMW96ADE6M6hAmV1LKHYWqC9rGEBp85cs7KMs895bDweLv1/EHx7GsPkjgKMsUIOyYckdz84in
MUddCHsgml5VIprDSRebb0aB87ooQTJjJHMC8vNSF6Lu3kjYNWZouC+uVZ6Qpz3HS9bbHSRhEoTE
ESE5YjAibnLWHzuFYaEoMxJAUoeTtJ0yC24i9Ci4c49GSUHIYO8IAbHR3mI8okf14VDpkqlY8eTF
c39gbUTAUAQZXUHb7tBMToXI390wlNYxCZ6Iacr85TgaCUTUHwAuD4k7bMNUS1xdFFQSOWwSnp13
PJDyZUQxUB/W0lFSGFAKHATZFSJXE7i9Gtr3To0Z57kYk5UVWmiwrQoIeA3jKw5lMc+BlKyUCoul
ANf0NKLy8kjItA6kYKtmJgrUh4ZbRwEwMGG5OCggggcNRhCdbVgQ4nUe8lfmNhSaB+6sroRVo2EC
osOSMa1EI0nIx1nsNdF0AIjNDjXUa7ALLR8tGZPQGIpTjlWPtLSnA4licZiWC0CJtjSk5C8+MB1h
ZYDGORNuJHWNW1Li+gMyI8bC00lVlOnG0fdrpsiW1p5iQRIUqbBaQomGBw0USsArLIRU1TGOpUwE
JIwAvMSrokrNqUXBXd3fps0jMaylGTab8qUYl6WnSjDMN5efgyUPwlzk9HJO5scvFLmllhwFRgr1
BEzQRsqvJXU5pKvdC65MSodoExMkwsFhMMiuUERxjBRWKQd3xgNrI7Xi9xrWLSQF8+HeJTLdK9HG
NHhdJphiPO+e0l0z+Il8qFYsC6+6fuKaiA2Fn9ThQOJZNHakUX1EUFQxS0c/cWaaBz9jtQjVoqoi
TEzmETSmpEreow04wL8SbUaAoBsSCKVaYfScUM/i3YcVHgclGX5fLaphhJXYEqjqgsTtz5nWVCWH
t3J1hFFR0x3R9XQV1k3Yb72zkrC0fY/e0vNxLUafYvVMGGwnFZrdtFygO5pEeFRPcggiKP1HE05v
tNgNcPcfIYwOeRtOKpV56GkkNxmMbzW3YOyogMXEWR+cUMuwZmCYiuHUTLI3C+dQzFb17zuSWhGC
CkNm9zV4S70NN+kOxdCcWKiQjmWtE1uw1uPQj6ZMFayLAhtxtRpOkRenkMYlSsZgRXKySYgicoNa
qCNFsCV4X25dhKJVCTkZya/hsRSCzItV/VzhL19uO8rhbL5ilKDUUlozEaE+k9B79Hc4U7hJycz1
sHg5FQq3zQRzp3HiOJiYVAmYGXWac7yjzuQFyP5PBMO6TxQEkj4M55O3QS0otrRqepzYauKL0gpS
q6wwQW8r1kNtIRq7XkaLlxAsPE0LmUlnfE/7r6gVyQfBwrCCUq3snMX4KdBBJDYy7NZ8sDLkFoFF
QMivINO+RvW/ayhUXrchx+0RKkPu93Q6MzUrlZG13Ay0itF9YGUY4DC8h9IDxjaHJE4O567YCx0h
5e0+8r0tTcOFwrJItCdgsxA4mJt6HqJluRNTfWmFyMQO8cWLYisRaa4DzwAvyKEdgxFFSGQYnmbf
ICc2eSJJ+AH/i7kinChIGVXfQIA=


--===============2272648628354708245==--