bzr push into mysql-5.5-cluster branch (john.duncan:3549 to 3550)

[John David Duncan]

 3550 John David Duncan	2011-09-24
      Remove the problem assert altogether

    modified:
      storage/ndb/memcache/src/NdbInstance.cc
      storage/ndb/memcache/src/QueryPlan.cc
 3549 John David Duncan	2011-09-24
      __func__ not available on very old Sun C compiler.
      Bad assertion in QueryPlan constructor.

    modified:
      .bzrignore
      storage/ndb/memcache/include/debug.h
      storage/ndb/memcache/src/QueryPlan.cc
=== modified file 'storage/ndb/memcache/src/NdbInstance.cc'
--- a/storage/ndb/memcache/src/NdbInstance.cc	2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/src/NdbInstance.cc	2011-09-25 05:06:46 +0000
@@ -23,7 +23,6 @@
 
 #include "NdbInstance.h"
 #include "debug.h"
-#include "atomics.h"
 
 /* ------------------------------------------
    ------------- NdbInstance ----------------

=== modified file 'storage/ndb/memcache/src/QueryPlan.cc'
--- a/storage/ndb/memcache/src/QueryPlan.cc	2011-09-25 04:37:27 +0000
+++ b/storage/ndb/memcache/src/QueryPlan.cc	2011-09-25 05:06:46 +0000
@@ -18,7 +18,6 @@
  02110-1301  USA
  */
 #include <stdio.h>
-#include <assert.h>
 #include <stddef.h>
 #include <strings.h>
 
@@ -149,7 +148,6 @@ QueryPlan::QueryPlan(Ndb *my_ndb, const 
     if(i == 0) first_value_col_id = this_col_id;
     last_value_col_is_int = is_integer(table, this_col_id);
   }
-  assert(nvaluecols == 0 || first_value_col_id > -1);
 
   if(spec->cas_column) {                                        // CAS
     col = get_ndb_col(spec, table, spec->cas_column);
@@ -240,7 +238,7 @@ const NdbDictionary::Index * QueryPlan::
   unsigned int nmatches, j;
     idx = dict->getIndex(list.elements[i].name, spec->table_name);
     if(idx && idx->getType() == NdbDictionary::Index::UniqueHashIndex) {
-      if(idx->getNoOfColumns() == spec->nkeycols) { 
+      if((int) idx->getNoOfColumns() == spec->nkeycols) { 
         for(nmatches = 0, j = 0; j < idx->getNoOfColumns() ; j++) 
           if(! strcmp(spec->key_columns[j], idx->getColumn(j)->getName()))
              nmatches++;
@@ -254,7 +252,7 @@ const NdbDictionary::Index * QueryPlan::
   for(unsigned int i = 0; i < list.count ; i++) {
     idx = dict->getIndex(list.elements[i].name, spec->table_name);
     if(idx && idx->getType() == NdbDictionary::Index::OrderedIndex) {
-      if(idx->getNoOfColumns() >= spec->nkeycols) {  
+      if((int) idx->getNoOfColumns() >= spec->nkeycols) {  
         if(! strcmp(spec->key_columns[0], idx->getColumn(0)->getName())) {
           is_scan = true;
           return idx;

No bundle (reason: useless for push emails).