bk commit into 4.1 tree (monty:1.1647)

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1647 03/11/28 13:15:42 monty@xxxxxxxxx +1 -0
  Fix wrong last edit for last commit

  sql/sql_select.cc
    1.282 03/11/28 13:15:40 monty@xxxxxxxxx +2 -2
    Fix wrong last edit for last commit

# 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: monty
# Host: narttu.mysql.fi
# Root: /my/mysql-4.1

--- 1.281/sql/sql_select.cc     Fri Nov 28 12:18:10 2003
+++ 1.282/sql/sql_select.cc     Fri Nov 28 13:15:40 2003
@@ -608,7 +608,7 @@
       !(select_options & SELECT_NO_UNLOCK))
   {
     TABLE **curr_table, **end;
-    for (curr_table= table, end=cur_table + const_tables ;
+    for (curr_table= table, end=curr_table + const_tables ;
         curr_table != end;
         curr_table++)
     {
@@ -1411,7 +1411,7 @@
          if (!(curr_table->select->cond=
                new Item_cond_and(curr_table->select->cond, sort_table_cond)))
            DBUG_VOID_RETURN;
-       curr_table->select_cond= cur_table->select->cond;
+       curr_table->select_cond= curr_table->select->cond;
        curr_table->select_cond->top_level_item();
        DBUG_EXECUTE("where",print_where(curr_table->select->cond,
                                         "select and having"););

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx