Commit 6642eb05 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.1-14809 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged
parents c1818061 b8864dcd

sql/ha_berkeley.cc

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked) 


    /* 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++)