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.cc | |
| 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.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 7cd534d60b3..32f623b86c9 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -25,7 +25,7 @@ We will need an updated Berkeley DB version for this. - Killing threads that has got a 'deadlock' - SHOW TABLE STATUS should give more information about the table. - - Get a more accurate count of the number of rows (estimate_number_of_rows()). + - Get a more accurate count of the number of rows (estimate_rows_upper_bound()). We could store the found number of rows when the table is scanned and then increment the counter for each attempted write. - We will need to extend the manager thread to makes checkpoints at @@ -63,7 +63,7 @@ #define HA_BERKELEY_ROWS_IN_TABLE 10000 /* to get optimization right */ #define HA_BERKELEY_RANGE_COUNT 100 #define HA_BERKELEY_MAX_ROWS 10000000 /* Max rows in table */ -/* extra rows for estimate_number_of_rows() */ +/* extra rows for estimate_rows_upper_bound() */ #define HA_BERKELEY_EXTRA_ROWS 100 /* Bits for share->status */ @@ -2556,7 +2556,7 @@ end: Used when sorting to allocate buffers and by the optimizer. */ -ha_rows ha_berkeley::estimate_number_of_rows() +ha_rows ha_berkeley::estimate_rows_upper_bound() { return share->rows + HA_BERKELEY_EXTRA_ROWS; } |