List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:December 20 2005 8:39pm
Subject:bk commit into 5.1 tree (sergefp:1.1971)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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.1971 05/12/20 23:38:15 sergefp@stripped +1 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.1-new
  into mysql.com:/home/psergey/mysql-5.1-ppruning-merge

  sql/ha_ndbcluster.cc
    1.226 05/12/20 23:38:11 sergefp@stripped +0 -0
    Auto merged

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-merge/RESYNC

--- 1.225/sql/ha_ndbcluster.cc	2005-12-20 22:53:23 +03:00
+++ 1.226/sql/ha_ndbcluster.cc	2005-12-20 23:38:11 +03:00
@@ -3123,7 +3123,6 @@
   DBUG_VOID_RETURN;
 }
 
-
 int ha_ndbcluster::extra(enum ha_extra_function operation)
 {
   DBUG_ENTER("extra");
@@ -3132,6 +3131,8 @@
     DBUG_PRINT("info", ("HA_EXTRA_RESET"));
     DBUG_PRINT("info", ("Clearing condition stack"));
     cond_clear();
+    if (m_part_info)
+      bitmap_clear_all(&m_part_info->used_partitions);
     break;
   case HA_EXTRA_IGNORE_DUP_KEY:       /* Dup keys don't rollback everything*/
     DBUG_PRINT("info", ("HA_EXTRA_IGNORE_DUP_KEY"));
Thread
bk commit into 5.1 tree (sergefp:1.1971)Sergey Petrunia20 Dec