List:Commits« Previous MessageNext Message »
From:monty Date:January 9 2006 9:10am
Subject:bk commit into 4.1 tree (monty:1.2473)
View as plain text  
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

  1.2473 06/01/09 11:10:49 monty@stripped +1 -0
  After merge fix (Lines lost in manual merge)

    1.65 06/01/09 11:10:45 monty@stripped +3 -0
    After merge fix (Lines lost in manual merge)

# 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:
# Root:	/home/my/mysql-4.1

--- 1.64/sql/	2006-01-08 19:07:47 +02:00
+++ 1.65/sql/	2006-01-09 11:10:45 +02:00
@@ -454,6 +454,9 @@
   if (insert_fields(thd,tables,tables->db,tables->alias,&it))
     goto err0;
+  select_limit+=offset_limit;
+  protocol->send_fields(&list,1);
     In ::external_lock InnoDB resets the fields which tell it that
     the handle is used in the HANDLER interface. Tell it again that
bk commit into 4.1 tree (monty:1.2473)monty9 Jan