Commit 907a81af authored by ram@mysql.r18.ru's avatar ram@mysql.r18.ru

bug fixes

parent 6adf0c11
...@@ -785,7 +785,7 @@ int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length) ...@@ -785,7 +785,7 @@ int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length)
goto err1; goto err1;
} }
if (ReinsertList.pages) if (ReinsertList.pages)
free(ReinsertList.pages); my_free((byte*) ReinsertList.pages, MYF(0));
/* check for redundant root (not leaf, 1 child) and eliminate */ /* check for redundant root (not leaf, 1 child) and eliminate */
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR) if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
......
...@@ -69,7 +69,7 @@ int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key, ...@@ -69,7 +69,7 @@ int rtree_delete_key(MI_INFO *info, uchar *page_buf, uchar *key,
uchar *key_start; uchar *key_start;
key_start= key - nod_flag; key_start= key - nod_flag;
if (nod_flag) if (!nod_flag)
key_length += info->s->base.rec_reflength; key_length += info->s->base.rec_reflength;
memmove(key_start, key + key_length, page_size - key_length - memmove(key_start, key + key_length, page_size - key_length -
......
...@@ -55,7 +55,7 @@ int run_test(const char *filename) ...@@ -55,7 +55,7 @@ int run_test(const char *filename)
int key_type=HA_KEYTYPE_DOUBLE; int key_type=HA_KEYTYPE_DOUBLE;
int key_length=8; int key_length=8;
int null_fields=0; int null_fields=0;
int nrecords=30; int nrecords=300;
int rec_length=0; int rec_length=0;
int uniques=0; int uniques=0;
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment