summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_search.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2008-08-28 20:52:23 +0200
committerSergei Golubchik <serg@mysql.com>2008-08-28 20:52:23 +0200
commit4be86917fe47645cae08b8e0e9c59da25c8d8e3e (patch)
treed9bd68b3a2e5b53d42bb02ed74d51b5bdcec4995 /storage/myisam/mi_search.c
parent942651ea6cc2b7537aa45ff1d55d64be4e191a16 (diff)
parentdd406c1e7ebeede6506c3f8c1bc62c671ea880a1 (diff)
downloadmariadb-git-4be86917fe47645cae08b8e0e9c59da25c8d8e3e.tar.gz
merge
Diffstat (limited to 'storage/myisam/mi_search.c')
-rw-r--r--storage/myisam/mi_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index f7d8d2c901c..2c346ea18f7 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -1802,13 +1802,13 @@ _mi_calc_bin_pack_key_length(MI_KEYDEF *keyinfo,uint nod_flag,uchar *next_key,
}
/* Check how many characters are identical to next key */
key= s_temp->key+next_length;
+ s_temp->prev_length= 0;
while (*key++ == *next_key++) ;
if ((ref_length= (uint) (key - s_temp->key)-1) == next_length)
{
s_temp->next_key_pos=0;
return length; /* can't pack next key */
}
- s_temp->prev_length=0;
s_temp->n_ref_length=ref_length;
return (int) (length-(ref_length - next_length) - next_length_pack +
get_pack_length(ref_length));