summaryrefslogtreecommitdiff
path: root/myisam/mi_key.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-01-31 04:47:25 +0200
committermonty@donna.mysql.com <>2001-01-31 04:47:25 +0200
commitbdbc0ef7a068d77e404bc4e13b864cb41112521a (patch)
tree851a8ba92ed9883efe2504e0726aae6843c317c0 /myisam/mi_key.c
parentacd45847ac0485617bece05abccbc9f4e9b2b782 (diff)
downloadmariadb-git-bdbc0ef7a068d77e404bc4e13b864cb41112521a.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()
Diffstat (limited to 'myisam/mi_key.c')
-rw-r--r--myisam/mi_key.c3
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;