From: pem
Date: March 28 2006 2:05pm
Subject: bk commit into 5.0 tree (pem:1.2101)
List-Archive: http://lists.mysql.com/commits/4244
Message-Id: <200603281405.k2SE5TYH020481@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.2101 06/03/28 16:05:06 pem@stripped +1 -0
  Removed forgotten comment line in sql_select.cc.

  sql/sql_select.cc
    1.399 06/03/28 16:04:50 pem@stripped +0 -1
    Forgot to remove commented line in previous 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/5.0/bug16474/mysql-5.0-runtime

--- 1.398/sql/sql_select.cc	2006-03-28 14:17:16 +02:00
+++ 1.399/sql/sql_select.cc	2006-03-28 16:04:50 +02:00
@@ -12337,7 +12337,6 @@
     Local SP variables may be int but are expressions, not positions.
     (And they can't be used before fix_fields is called for them).
   */
-  //  if (order_item->type() == Item::INT_ITEM && !order_item->is_splocal())
   if (order_item->type() == Item::INT_ITEM && order_item->basic_const_item())
   {						/* Order by position */
     uint count= (uint) order_item->val_int();