bk commit into 5.0 tree (mskold:1.1947)

[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
  1.1947 05/05/08 22:42:40 mskold@stripped +2 -0
  Removed call to cond_push for empty cond

  sql/ha_ndbcluster.cc
    1.187 05/05/08 22:41:59 mskold@stripped +13 -16
    Removed call to cond_push for empty cond

  sql/sql_select.cc
    1.329 05/05/08 22:41:58 mskold@stripped +6 -3
    Removed call to cond_push for empty cond

# 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:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.328/sql/sql_select.cc	Sat May  7 22:44:47 2005
+++ 1.329/sql/sql_select.cc	Sun May  8 22:41:58 2005
@@ -5406,9 +5406,12 @@
             COND *push_cond= 
               make_cond_for_table(cond,current_map,current_map);
             tab->table->file->pushed_cond= NULL;
-	    /* Push condition to handler */
-            if (!tab->table->file->cond_push(push_cond))
-              tab->table->file->pushed_cond= push_cond;
+            if (push_cond)
+            {
+              /* Push condition to handler */
+              if (!tab->table->file->cond_push(push_cond))
+                tab->table->file->pushed_cond= push_cond;
+            }
           }
         }
         else

--- 1.186/sql/ha_ndbcluster.cc	Sat May  7 22:49:02 2005
+++ 1.187/sql/ha_ndbcluster.cc	Sun May  8 22:41:59 2005
@@ -6106,24 +6106,21 @@
 ha_ndbcluster::cond_push(const COND *cond) 
 { 
   DBUG_ENTER("cond_push");
-  if (cond)
-  {
-    Ndb_cond_stack *ndb_cond = new Ndb_cond_stack();
-    DBUG_EXECUTE("where",print_where((COND *)cond, m_tabname););
-    if (m_cond_stack)
+  Ndb_cond_stack *ndb_cond = new Ndb_cond_stack();
+  DBUG_EXECUTE("where",print_where((COND *)cond, m_tabname););
+  if (m_cond_stack)
     ndb_cond->next= m_cond_stack;
-    else
-      ndb_cond->next= NULL;
-    m_cond_stack= ndb_cond;
-    
-    if (serialize_cond(cond, ndb_cond))
-    {
+  else
+    ndb_cond->next= NULL;
+  m_cond_stack= ndb_cond;
+  
+  if (serialize_cond(cond, ndb_cond))
+  {
     DBUG_RETURN(NULL);
-    }
-    else
-    {
-      cond_pop();
-    }
+  }
+  else
+  {
+    cond_pop();
   }
   DBUG_RETURN(cond); 
 }