diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-12 04:34:56 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-12 04:34:56 +0200 |
| commit | 28ad76e22c799a933006e8cad31a7389e85106eb (patch) | |
| tree | 3c78736b50f99b9b8ac968afb833752f201a482a /sql/ha_berkeley.cc | |
| parent | 7847639270269bc6aebeed36e68ddfec0cf6c145 (diff) | |
| download | mariadb-git-28ad76e22c799a933006e8cad31a7389e85106eb.tar.gz | |
Fixed delete in tables with hidden primary key
Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files
Docs/manual.texi:
Updated 'known bugs'
include/my_sys.h:
Added define for checking number of bytes left in the IO_CACHE
mysql-test/mysql-test-run:
Small bug fixes
mysys/mf_iocache2.c:
Use new define
sql/filesort.cc:
Temporary fix for FULLTEXT index
sql/ha_berkeley.cc:
Fix for delete in tables with hidden primary key
Remove not used BDB logs on shutdown
sql/ha_myisam.cc:
Don't give warnings for repair on slaves
sql/hostname.cc:
Portability fix
sql/log.cc:
Fix transaction log files
sql/log_event.h:
portability fix
sql/slave.cc:
Don't give warnings for repair on slaves
sql/sql_class.h:
Cleanup
sql/sql_parse.cc:
Fixed typo
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index ceaa0b0291a..0436b16fddc 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -161,6 +161,7 @@ bool berkeley_end(void) DBUG_ENTER("berkeley_end"); if (!db_env) return 1; + berkeley_cleanup_log_files(); error=db_env->close(db_env,0); // Error is logged db_env=0; hash_free(&bdb_open_tables); @@ -987,7 +988,7 @@ int ha_berkeley::remove_key(DB_TXN *sub_trans, uint keynr, const byte *record, DBUG_PRINT("enter",("index: %d",keynr)); if ((table->key_info[keynr].flags & (HA_NOSAME | HA_NULL_PART_KEY)) == - HA_NOSAME) + HA_NOSAME || keynr == primary_key) { // Unique key dbug_assert(keynr == primary_key || prim_key->data != key_buff2); error=key_file[keynr]->del(key_file[keynr], sub_trans, |