bk commit into 5.0 tree (mskold:1.2476) BUG#27494

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-12 22:06:20+02:00, mskold@stripped +1 -0
  bug#27494  An invalid subselect crashes mysql server: Added check for missing arguments

  sql/ha_ndbcluster_cond.cc@stripped, 2007-09-12 22:05:37+02:00, mskold@stripped +6 -0
    #27494  An invalid subselect crashes mysql server: Added check for missing arguments

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0-ndb

--- 1.4/sql/ha_ndbcluster_cond.cc	2007-09-12 22:06:32 +02:00
+++ 1.5/sql/ha_ndbcluster_cond.cc	2007-09-12 22:06:32 +02:00
@@ -46,6 +46,12 @@ void ndb_serialize_cond(const Item *item
   // 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));
+      context->skip= 0;
+      DBUG_VOID_RETURN;
+    }
     DBUG_PRINT("info", ("Skiping argument %d", context->skip));
     context->skip--;
     switch (item->type()) {