diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
| commit | 495231ea25a82d97e69e96ff9e5d7688434cfff2 (patch) | |
| tree | 851a8ba92ed9883efe2504e0726aae6843c317c0 /myisam/mi_key.c | |
| parent | bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb (diff) | |
| download | mariadb-git-495231ea25a82d97e69e96ff9e5d7688434cfff2.tar.gz | |
New myisamchk option --sort-recover
Allow delete of crashed MyISAM tables
Fixed bug when BLOB was first part of key
Fixed bug when using result from CASE in GROUP BY
Fixed core-dump bug in monthname()
Optimized calling of check_db_name()
Docs/manual.texi:
Added more information about myisamchk
client/mysqladmin.c:
Added error message for CREATE database and fixed possible overflow bug
include/myisam.h:
New myisamchk option --sort-recover
libmysql/libmysql.c:
Removed commented code
Don't define getpwuid (breaks on SCO 3.2)
myisam/mi_check.c:
Fixed (new) bug when using --recover --optimize
myisam/mi_delete_table.c:
Allow delete of crashed tables
myisam/mi_key.c:
Fixed bug when BLOB was first part of key
myisam/myisamchk.c:
New myisamchk option --sort-recover
mysql-test/r/case.result:
New test cases to check for reported bugs
mysql-test/r/func_time.result:
New test cases to check for reported bugs
mysql-test/r/type_blob.result:
New test cases to check for reported bugs
mysql-test/r/type_datetime.result:
New test cases to check for reported bugs
mysql-test/t/case.test:
New test cases to check for reported bugs
mysql-test/t/func_time.test:
New test cases to check for reported bugs
mysql-test/t/type_blob.test:
New test cases to check for reported bugs
mysql-test/t/type_datetime.test:
New test cases to check for reported bugs
mysys/my_bitmap.c:
Optimize
sql-bench/limits/ms-sql.cfg:
Updated limits
sql/item_cmpfunc.cc:
Fixed bug when using result from CASE in GROUP BY
sql/item_cmpfunc.h:
Fixed bug when using result from CASE in GROUP BY
sql/item_timefunc.cc:
Fixed core-dump bug in monthname()
sql/sql_db.cc:
Optimized calling of check_db_name()
sql/sql_parse.cc:
Optimized calling of check_db_name()
sql/table.cc:
Fixed typo
Diffstat (limited to 'myisam/mi_key.c')
| -rw-r--r-- | myisam/mi_key.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c index bf2f5c292dd..9f4e2cb1524 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -184,8 +184,9 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, /* Length of key-part used with mi_rkey() always 2 */ uint tmp_length=uint2korr(pos); k_length-= 2+length; - set_if_smaller(length,tmp_length); + set_if_smaller(length,tmp_length); /* Safety */ store_key_length_inc(key,length); + old+=2; /* Skipp length */ memcpy((byte*) key, pos+2,(size_t) length); key+= length; continue; |