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/sql_handler.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/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index f40ebfe43ed..c7fb237ccf2 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -126,7 +126,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, mode=RNEXT; break; case RLAST: - dbug_assert(keyname != 0); + DBUG_ASSERT(keyname != 0); err=table->file->index_last(table->record[0]); mode=RPREV; break; @@ -136,12 +136,12 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, table->file->rnd_next(table->record[0]); break; case RPREV: - dbug_assert(keyname != 0); + DBUG_ASSERT(keyname != 0); err=table->file->index_prev(table->record[0]); break; case RKEY: { - dbug_assert(keyname != 0); + DBUG_ASSERT(keyname != 0); KEY *keyinfo=table->key_info+keyno; KEY_PART_INFO *key_part=keyinfo->key_part; uint key_len; |