From: Date: June 5 2006 12:57pm
Subject: bk commit into 5.1 tree (msvensson:1.2186)
List-Archive: http://lists.mysql.com/commits/7266
Message-Id: <20060605105758.0CAF586DE76@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2186 06/06/05 12:57:46 msvensson@neptunus.(none) +1 -0
  Change "and" to "&&"

  sql/filesort.cc
    1.107 06/06/05 12:57:39 msvensson@neptunus.(none) +1 -1
    Change "and" to "&&"

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.106/sql/filesort.cc	2006-06-04 17:52:08 +02:00
+++ 1.107/sql/filesort.cc	2006-06-05 12:57:39 +02:00
@@ -454,7 +454,7 @@
   /* Temporary set for register_used_fields and register_field_in_read_map */
   sort_form->read_set= &sort_form->tmp_set;
   register_used_fields(param);
-  if (select and select->cond)
+  if (select && select->cond)
     select->cond->walk(&Item::register_field_in_read_map, 1,
                        (byte*) sort_form);
   sort_form->column_bitmaps_set(&sort_form->tmp_set, &sort_form->tmp_set);