diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-27 23:43:20 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-27 23:43:20 +0300 |
| commit | cbe21a8eb6c53ed4eb7f6228a322d642abacde95 (patch) | |
| tree | ff71298ae3c57caff8ca7c70666d60292290e366 /heap | |
| parent | 2025b35544f2a43322a9fd3574d19469383009c2 (diff) | |
| parent | a57c08d46815c13c09e713a3ea05076c19001a0e (diff) | |
| download | mariadb-git-cbe21a8eb6c53ed4eb7f6228a322d642abacde95.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/_check.c | 4 | ||||
| -rw-r--r-- | heap/hp_create.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/heap/_check.c b/heap/_check.c index 4316a9926f7..cc832f8ed5b 100644 --- a/heap/_check.c +++ b/heap/_check.c @@ -167,7 +167,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, ulong found= 0; byte *key, *recpos; uint key_length; - uint not_used; + uint not_used[2]; if ((key= tree_search_edge(&keydef->rb_tree, info->parents, &info->last_pos, offsetof(TREE_ELEMENT, left)))) @@ -177,7 +177,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, memcpy(&recpos, key + (*keydef->get_key_length)(keydef,key), sizeof(byte*)); key_length= hp_rb_make_key(keydef, info->recbuf, recpos, 0); if (ha_key_cmp(keydef->seg, (uchar*) info->recbuf, (uchar*) key, - key_length, SEARCH_FIND | SEARCH_SAME, ¬_used)) + key_length, SEARCH_FIND | SEARCH_SAME, not_used)) { error= 1; DBUG_PRINT("error",("Record in wrong link: key: %d Record: 0x%lx\n", diff --git a/heap/hp_create.c b/heap/hp_create.c index 8fcf7dde000..47dcb00278a 100644 --- a/heap/hp_create.c +++ b/heap/hp_create.c @@ -203,9 +203,9 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, static int keys_compare(heap_rb_param *param, uchar *key1, uchar *key2) { - uint not_used; + uint not_used[2]; return ha_key_cmp(param->keyseg, key1, key2, param->key_length, - param->search_flag, ¬_used); + param->search_flag, not_used); } static void init_block(HP_BLOCK *block, uint reclength, ulong min_records, |