bk commit into 5.1 tree (jimw:1.1950) BUG#14809

[Jim Winstead]

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.1950 05/11/09 16:28:20 jimw@stripped +1 -0
  Avoid setting DB_NOOVERWRITE flag on hidden primary keys in tables
  using the BDB storage engine. (Bug #14809)

  sql/ha_berkeley.cc
    1.160 05/11/09 16:28:16 jimw@stripped +1 -1
    Don't set DB_NOOVERWRITE on hidden primary key, since we already
    guarantee uniqueness in how these keys are generated.

# 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-14809

--- 1.159/sql/ha_berkeley.cc	2005-11-07 07:24:36 -08:00
+++ 1.160/sql/ha_berkeley.cc	2005-11-09 16:28:16 -08:00
@@ -665,7 +665,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++)