List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:December 16 2005 10:31pm
Subject:bk commit into 5.1 tree (jimw:1.1974)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.1974 05/12/16 14:31:27 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-14809
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  sql/ha_berkeley.cc
    1.164 05/12/16 14:31:22 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.163/sql/ha_berkeley.cc	2005-12-05 18:08:31 -08:00
+++ 1.164/sql/ha_berkeley.cc	2005-12-16 14:31:22 -08:00
@@ -666,7 +666,7 @@
 
     /* Open other keys;  These are part of the share structure */
     key_file[primary_key]=file;
-    key_type[primary_key]=DB_NOOVERWRITE;
+    key_type[primary_key]= hidden_primary_key ? 0 : DB_NOOVERWRITE;
 
     DB **ptr=key_file;
     for (uint i=0, used_keys=0; i < table_share->keys ; i++, ptr++)
Thread
bk commit into 5.1 tree (jimw:1.1974)Jim Winstead16 Dec