Commit 965124b4 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
parents df552c31 f2159e2d

sql/ha_ndbcluster_cond.cc

+8 −0
Original line number Diff line number Diff line
@@ -46,6 +46,14 @@ void ndb_serialize_cond(const Item *item, void *arg) 
  // Check if we are skipping arguments to a function to be evaluated

  if (context->skip)

  {

    if (!item)

    {

      DBUG_PRINT("info", ("Unexpected mismatch of found and expected number of function arguments %u", context->skip));

      sql_print_error("ndb_serialize_cond: Unexpected mismatch of found and "

                      "expected number of function arguments %u", context->skip);

      context->skip= 0;

      DBUG_VOID_RETURN;

    }

    DBUG_PRINT("info", ("Skiping argument %d", context->skip));

    context->skip--;

    switch (item->type()) {