bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3342)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3/ based on revid:magnus.blaudd@stripped

 3342 Magnus Blåudd	2010-11-16
      ndb - fix warning caused by pointer subtraction result type

    modified:
      sql/ha_ndbcluster_cond.cc
=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2010-11-15 10:17:01 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2010-11-16 12:24:29 +0000
@@ -1494,7 +1494,7 @@ int ha_ndbcluster_cond::generate_scan_fi
             sprintf(buf+strlen(buf), " %02x", ptr[k]);
           }
           ptr+=key_part->store_length;
-          if (ptr - key->key >= key->length)
+          if (ptr - key->key >= (ptrdiff_t)key->length)
           {
             /*
               key_range has no count of parts so must test byte length.
@@ -1593,7 +1593,7 @@ int ha_ndbcluster_cond::generate_scan_fi
             DBUG_RETURN(1);
         }
         ptr+=key_part->store_length;
-        if (ptr - start_key->key >= start_key->length)
+        if (ptr - start_key->key >= (ptrdiff_t)start_key->length)
         {
           break;
         }

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