diff options
| author | unknown <serg@serg.mylan> | 2004-06-26 14:21:32 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-26 14:21:32 +0200 |
| commit | 7eb1afabea183c2b8a2cc50af659f16d8092b069 (patch) | |
| tree | b347e9d8239a7545f7e1124189aa2de1238fbcb0 /sql/ha_berkeley.cc | |
| parent | dbdca40549f9237893dfb872402a9e7f57084ef0 (diff) | |
| download | mariadb-git-7eb1afabea183c2b8a2cc50af659f16d8092b069.tar.gz | |
after merge fixed
mysql-test/r/flush_table.result:
after merge fixed
duplicated tests removed
mysql-test/t/flush_table.test:
after merge fixed
duplicated tests removed
sql/sql_yacc.yy:
alias is not db-qualified
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index ecdf4c60d3e..4bed33af15b 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1583,18 +1583,12 @@ int ha_berkeley::index_last(byte * buf) int ha_berkeley::rnd_init(bool scan) { DBUG_ENTER("rnd_init"); -#ifdef NOT_YET - DBUG_ASSERT(active_index == MAX_KEY); -#endif current_row.flags=DB_DBT_REALLOC; DBUG_RETURN(index_init(primary_key)); } int ha_berkeley::rnd_end() { -#ifdef NOT_YET - DBUG_ASSERT(active_index == MAX_KEY); -#endif return index_end(); } |