diff options
| author | unknown <jimw@mysql.com> | 2005-12-16 14:31:27 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-16 14:31:27 -0800 |
| commit | 6642eb0581cec439c2e783f6a9d99bb938e1f6b6 (patch) | |
| tree | 2c3dfcea24fdc58017ca4f149314613987883fa8 /sql/ha_berkeley.cc | |
| parent | c18180615439d28b5126e9d31396c1310de08a38 (diff) | |
| parent | b8864dcde66ae93d3afb95bcbb081c70afa5d90f (diff) | |
| download | mariadb-git-6642eb0581cec439c2e783f6a9d99bb938e1f6b6.tar.gz | |
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
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 188ed7fbaa6..9e58305371f 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -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++) |