diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
| commit | bee9933ab83729e6ca2f2826706b1ab5b985df87 (patch) | |
| tree | cd775f59b4803ef23e407df9d47af3ae7b517a13 /myisam | |
| parent | aaca0e3c6bd71a7b34fcb3a137ab1113a20dca1f (diff) | |
| download | mariadb-git-bee9933ab83729e6ca2f2826706b1ab5b985df87.tar.gz | |
Small bug fixes
support-files/mysql.server-sys5.sh:
Change mode to -rw-rw-r--
Docs/manual.texi:
Added information about BeOS, Access 2000, AIX and user links
client/mysql.cc:
Fixed SOURCE to work on windows
client/mysqldump.c:
Strip of white space
configure.in:
Fix for AIX
include/dbug.h:
Assert handling
include/my_pthread.h:
Ia64 needs more thread stack than other processors
include/my_sys.h:
More comments
myisam/mi_key.c:
Fixed wrong key length checks
mysql.proj:
update
mysys/charset.c:
Cleanup
mysys/mf_keycache.c:
Moved SEC_LINK to file that used it
mysys/my_static.h:
Moved SEC_LINK to file that used it
scripts/Makefile.am:
Fix for debian
scripts/mysql_install_db.sh:
Cleanup
sql/gen_lex_hash.cc:
Better values
sql/ha_berkeley.cc:
Fix of reading of unique key
sql/handler.cc:
Fix memory allocation bug
sql/mysqld.cc:
Fix for Ia64
sql/share/charsets/latin1.conf:
Fixed sortorder back to scandinavian.
sql/sql_yacc.yy:
FULL shouldn't be a keyword
support-files/Makefile.am:
Fix for debian
support-files/mysql.server.sh:
Cleanups
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c index f9eb9b77835..d64a02ea5f5 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -283,7 +283,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, uint length; get_key_length(length,key); #ifdef CHECK_KEYS - if (length >= keyseg->length || key+length > key_end) + if (length > keyseg->length || key+length > key_end) goto err; #endif memcpy(record+keyseg->start,(byte*) key, length); @@ -294,7 +294,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, uint length; get_key_length(length,key); #ifdef CHECK_KEYS - if (length >= keyseg->length || key+length > key_end) + if (length > keyseg->length || key+length > key_end) goto err; #endif memcpy(record+keyseg->start+keyseg->bit_start, |