From: Date: November 16 2005 3:58pm
Subject: bk commit into 5.0 tree (ingo:1.1963) BUG#14616
List-Archive: http://lists.mysql.com/internals/32315
X-Bug: 14616
Message-Id: <E1EcOju-0001i0-Qq@chilla.local>

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.1963 05/11/16 15:58:17 ingo@stripped +1 -0
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  After merge fix.

  sql/sql_select.cc
    1.377 05/11/16 15:58:11 ingo@stripped +1 -1
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    After merge fix.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-5000

--- 1.376/sql/sql_select.cc	2005-11-16 10:13:06 +01:00
+++ 1.377/sql/sql_select.cc	2005-11-16 15:58:11 +01:00
@@ -11132,7 +11132,7 @@
     Check which keys can be used to resolve ORDER BY.
     We must not try to use disabled keys.
   */
-  usable_keys= table->keys_in_use;
+  usable_keys= table->s->keys_in_use;
 
   for (ORDER *tmp_order=order; tmp_order ; tmp_order=tmp_order->next)
   {