diff options
author | unknown <sergefp@mysql.com> | 2004-09-13 06:14:25 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-09-13 06:14:25 +0400 |
commit | b28118abfb0cd05e7172a20842bcdce39f49791a (patch) | |
tree | 9ecce886341d7871fcdae98f906e14129bb3af0d /sql/ha_berkeley.h | |
parent | 3f70b62cebfbaa0e93ea5f378167d9d3e7b02a91 (diff) | |
download | mariadb-git-b28118abfb0cd05e7172a20842bcdce39f49791a.tar.gz |
Fix for BUG#5117:
* Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
* made filesort to use full sort buffer if number of rows to sort is not known.
sql/examples/ha_tina.h:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/filesort.cc:
* Fix for BUG#5117: made filesort() to use full sort buffer if number of rows to sort is not known.
* Comments and assertion added
sql/ha_berkeley.cc:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_berkeley.h:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.cc:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.h:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/handler.h:
Renamed estimate_number_of_rows -> estimate_rows_upper_bound
Diffstat (limited to 'sql/ha_berkeley.h')
-rw-r--r-- | sql/ha_berkeley.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h index 5cba3bebf10..25d3e128502 100644 --- a/sql/ha_berkeley.h +++ b/sql/ha_berkeley.h @@ -100,7 +100,7 @@ class ha_berkeley: public handler ulong table_flags(void) const { return int_table_flags; } uint max_supported_keys() const { return MAX_KEY-1; } uint extra_rec_buf_length() { return BDB_HIDDEN_PRIMARY_KEY_LENGTH; } - ha_rows estimate_number_of_rows(); + ha_rows estimate_rows_upper_bound(); const key_map *keys_to_use_for_scanning() { return &key_map_full; } bool has_transactions() { return 1;} |