diff options
author | unknown <monty@donna.mysql.fi> | 2001-03-07 14:06:39 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.fi> | 2001-03-07 14:06:39 +0200 |
commit | 9b8ddd1a6d0afc8ab9fa3d0f808b53781b9bab1f (patch) | |
tree | 79b7da6c72627528a82824c0bb9412e8d4802f8e /sql/sql_select.cc | |
parent | 6068405ca64ea9ee5fef22d2133cc374639a1407 (diff) | |
download | mariadb-git-9b8ddd1a6d0afc8ab9fa3d0f808b53781b9bab1f.tar.gz |
Removed duplicated index_init() calls that causes problems with BDB
tables.
Merged maxsql.spec with mysql.spec
mysql-test/r/innobase.result:
Almost up to date test results
mysql-test/t/innobase.test:
Added testing of error codes
sql-bench/test-insert.sh:
Added testing of key-only-read
sql/ha_berkeley.cc:
Added DBUG_PRINT
sql/sql_select.cc:
Removed duplicated index_init() calls
support-files/maxsql.spec.sh:
Merge with mysql.spec. Take into account that BDB and Innobase is
in the MySQL source tree
support-files/mysql.spec.sh:
Removed usage of innobase in standard RPM
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 9359b40849c..df3f1c070a4 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2488,6 +2488,7 @@ make_join_readinfo(JOIN *join,uint options) else if (table->used_keys && ! (tab->select && tab->select->quick)) { // Only read index tree tab->index=find_shortest_key(table, table->used_keys); + tab->table->file->index_init(tab->index); tab->read_first_record= join_init_read_first_with_key; tab->type=JT_NEXT; // Read with index_first / index_next } @@ -4445,7 +4446,6 @@ join_init_read_first_with_key(JOIN_TAB *tab) tab->read_record.file=table->file; tab->read_record.index=tab->index; tab->read_record.record=table->record[0]; - tab->table->file->index_init(tab->index); error=tab->table->file->index_first(tab->table->record[0]); if (error) { @@ -4494,7 +4494,6 @@ join_init_read_last_with_key(JOIN_TAB *tab) tab->read_record.file=table->file; tab->read_record.index=tab->index; tab->read_record.record=table->record[0]; - tab->table->file->index_init(tab->index); error=tab->table->file->index_last(tab->table->record[0]); if (error) { @@ -5177,6 +5176,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit) tab->index=nr; tab->read_first_record= (flag > 0 ? join_init_read_first_with_key: join_init_read_last_with_key); + tab->table->file->index_init(tab->index); tab->type=JT_NEXT; // Read with index_first(), index_next() DBUG_RETURN(1); } |