diff options
author | unknown <monty@hundin.mysql.fi> | 2001-07-17 21:04:01 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-07-17 21:04:01 +0300 |
commit | 9302266bde215864e1b70d0be583c3eaac6be898 (patch) | |
tree | f19e7e378a6170f04e3eebee868b77be238b17d7 /sql/ha_berkeley.cc | |
parent | 782750a0ed04f80a40665f787f2debeba0a587a0 (diff) | |
download | mariadb-git-9302266bde215864e1b70d0be583c3eaac6be898.tar.gz |
Removed wrong warning from thr_lock
Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts
Docs/manual.texi:
Added link to copyleft license.
Updated Changelog
configure.in:
Fixed typo
mysys/thr_lock.c:
Removed wrong warning
sql/ha_berkeley.cc:
Fixed problem with UPDATE
sql/sql_acl.cc:
Fixed problem with GRANT FILE privilege on database level
sql/sql_parse.cc:
Fixed that you don't get aborted connection error if you are not using --warning
sql/sql_show.cc:
Fixed problem with SHOW OPEN TABLES when not using BDB
tests/fork2_test.pl:
Added test of ALTER TABLE
tests/fork_big.pl:
Added test of ALTER TABLE
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 32af39e4a0d..d2b3ef62865 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -453,9 +453,11 @@ int ha_berkeley::open(const char *name, int mode, uint test_if_locked) if ((primary_key=table->primary_key) >= MAX_KEY) { // No primary key primary_key=table->keys; + key_used_on_scan=MAX_KEY; ref_length=hidden_primary_key=BDB_HIDDEN_PRIMARY_KEY_LENGTH; } - key_used_on_scan=primary_key; + else + key_used_on_scan=primary_key; /* Need some extra memory in case of packed keys */ uint max_key_length= table->max_key_length + MAX_REF_PARTS*3; |