diff options
| author | unknown <monty@tik.mysql.com> | 2000-11-13 23:55:10 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.com> | 2000-11-13 23:55:10 +0200 |
| commit | f3d2341f1f30384d92b285c1e421d8c599ee2b79 (patch) | |
| tree | 6689cb755cdb6ba0fb4cc6fbb215d75b175228d2 /sql/ha_berkeley.cc | |
| parent | 675d31ee9a14d636d838400c670d0a1c2b964c9a (diff) | |
| download | mariadb-git-f3d2341f1f30384d92b285c1e421d8c599ee2b79.tar.gz | |
Bug fixes, TRUNCATE, safer passwords on command line and connect timeout
Docs/manual.texi:
Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
Added --timeout
client/mysqladmin.c:
Safer password handling
client/mysqldump.c:
Safer password handling
client/mysqlimport.c:
Safer password handling
client/mysqlshow.c:
Safer password handling
configure.in:
Fixes for Darwin and added test of poll
include/my_pthread.h:
Fixes for darwin
include/violite.h:
Added test for polling
libmysql/libmysql.c:
connect timeout
libmysql/violite.c:
connect timeout
mysys/hash.c:
Fix when delting from empty table
scripts/safe_mysqld.sh:
Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
Function print_time
sql-bench/crash-me.sh:
Added test of truncate
sql-bench/test-insert.sh:
More "estimated" tests
sql-bench/test-select.sh:
More "estimated" tests
sql/filesort.cc:
Removed allocation of extra memory
sql/ha_berkeley.cc:
Better estimation of number of rows
sql/item_create.cc:
Truncate
sql/item_create.h:
Truncate
sql/item_strfunc.cc:
Removed usage of MY_FAE
sql/lex.h:
Truncate
sql/lock.cc:
Fixed possible loop bug
sql/log.cc:
Removed usage of FILE:s
sql/mysqld.cc:
Print of more server variables
sql/sql_class.h:
Changed FILE -> File
sql/sql_insert.cc:
Fixed bug in temptable handling
sql/sql_lex.h:
Cleanup
sql/sql_load.cc:
Removed usage of MY_FAE
sql/sql_parse.cc:
Cleanup + TRUNCATE
sql/sql_select.cc:
Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
TRUNCATE
sql/violite.c:
Merge with client/violite.c
strings/strstr-sparc.s:
Fixed wrong register usage
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 13306397fe1..80421f006cc 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -60,6 +60,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 */ const char *ha_berkeley_ext=".db"; bool berkeley_skip=0; @@ -1615,12 +1616,13 @@ void ha_berkeley::update_auto_primary_key() ha_rows ha_berkeley::estimate_number_of_rows() { ulonglong max_ident; + ulonglong max_rows=table->max_rows ? table->max_rows : HA_BERKELEY_MAX_ROWS; if (!hidden_primary_key) - return INT_MAX32; + return (ha_rows) max_rows; pthread_mutex_lock(&share->mutex); max_ident=share->auto_ident+EXTRA_RECORDS; pthread_mutex_unlock(&share->mutex); - return (ha_rows) min(max_ident,(ulonglong) INT_MAX32); + return (ha_rows) min(max_ident,max_rows); } #endif /* HAVE_BERKELEY_DB */ |