bk commit into 5.1 tree (mronstrom:1.1853)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.1853 05/07/14 10:50:39 mronstrom@stripped +1 -0
  Merge mistake

  sql/sql_select.cc
    1.349 05/07/14 10:50:27 mronstrom@stripped +1 -0
    Merge mistake

# 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:	mronstrom
# Host:	c-210ae253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl1354

--- 1.348/sql/sql_select.cc	2005-07-14 00:30:57 +02:00
+++ 1.349/sql/sql_select.cc	2005-07-14 10:50:27 +02:00
@@ -1620,6 +1620,7 @@
           attribute on the INDEX SCAN.
         */
         skip_sort_order= 1;
+      }
     }
   }
   /* XXX: When can we have here thd->net.report_error not zero? */