diff options
| author | unknown <monty@bitch.mysql.fi> | 2001-11-28 02:55:52 +0200 |
|---|---|---|
| committer | unknown <monty@bitch.mysql.fi> | 2001-11-28 02:55:52 +0200 |
| commit | 06e1e27557cc6788fafd423eea6ca5073dce892a (patch) | |
| tree | 40e5d73c964ca6aeb5e0e7d4294e70216edaa397 /sql/ha_berkeley.cc | |
| parent | f33fb18677d673f1bcb2d617355ea3e2dbb04f48 (diff) | |
| download | mariadb-git-06e1e27557cc6788fafd423eea6ca5073dce892a.tar.gz | |
New improved IO_CACHE
include/my_global.h:
Remove dbug_assert() (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
Fixed that xterm works on Solaris 2.8.
Fixed printing of errors
mysql-test/r/isam.result:
Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
Removed MyISAM test from ISAM test
mysys/my_alloc.c:
Removed warnings
mysys/my_bitmap.c:
Use DBUG_ASSERT
mysys/my_pthread.c:
Use DBUG_ASSERT
mysys/my_seek.c:
More DBUG
sql/ha_berkeley.cc:
Use DBUG_ASSERT
sql/ha_innobase.cc:
Use DBUG_ASSERT
sql/log.cc:
Use DBUG_ASSERT
sql/opt_range.cc:
Use DBUG_ASSERT
sql/sql_base.cc:
Use DBUG_ASSERT
sql/sql_handler.cc:
Use DBUG_ASSERT
sql/sql_load.cc:
Cleanup
sql/sql_parse.cc:
Use DBUG_ASSERT
sql/sql_repl.cc:
Cleanup
sql/sql_select.cc:
Use DBUG_ASSERT
tools/mysqlmanager.c:
Cleanup
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index c11b1bbd4f8..3cb14b5e72f 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1045,7 +1045,7 @@ int ha_berkeley::restore_keys(DB_TXN *trans, key_map changed_keys, } err: - dbug_assert(error != DB_KEYEXIST); + DBUG_ASSERT(error != DB_KEYEXIST); DBUG_RETURN(error); } @@ -1187,7 +1187,7 @@ int ha_berkeley::remove_key(DB_TXN *trans, uint keynr, const byte *record, ((table->key_info[keynr].flags & (HA_NOSAME | HA_NULL_PART_KEY)) == HA_NOSAME)) { // Unique key - dbug_assert(keynr == primary_key || prim_key->data != key_buff2); + DBUG_ASSERT(keynr == primary_key || prim_key->data != key_buff2); error=key_file[keynr]->del(key_file[keynr], trans, keynr == primary_key ? prim_key : @@ -1201,7 +1201,7 @@ int ha_berkeley::remove_key(DB_TXN *trans, uint keynr, const byte *record, row to find the key to be delete and delete it. We will never come here with keynr = primary_key */ - dbug_assert(keynr != primary_key && prim_key->data != key_buff2); + DBUG_ASSERT(keynr != primary_key && prim_key->data != key_buff2); DBC *tmp_cursor; if (!(error=key_file[keynr]->cursor(key_file[keynr], trans, &tmp_cursor, 0))) |