diff options
| author | unknown <ingo@mysql.com> | 2005-09-23 10:49:08 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-23 10:49:08 +0200 |
| commit | c08721e5fa8e67a2aad8725d4eb9cca43062b445 (patch) | |
| tree | de63fb039c1b666c02ce35a3f1b10723072172d8 /myisam/mi_rkey.c | |
| parent | 727f0b8a1f2fdc3f458f6b5da5ebe3cc73620403 (diff) | |
| parent | 674c8165ea4b3430f397d84b0c79642de7b12ce4 (diff) | |
| download | mariadb-git-c08721e5fa8e67a2aad8725d4eb9cca43062b445.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-4000
into mysql.com:/home/mydev/mysql-4.1-4100
myisam/mi_dbug.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisammrg/myrg_rkey.c:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
mysql-test/r/merge.result:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
mysql-test/t/merge.test:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
Diffstat (limited to 'myisam/mi_rkey.c')
| -rw-r--r-- | myisam/mi_rkey.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 12db00337ee..9aa2be3c706 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -31,8 +31,8 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, HA_KEYSEG *last_used_keyseg; uint pack_key_length, use_key_length, nextflag; DBUG_ENTER("mi_rkey"); - DBUG_PRINT("enter",("base: %lx inx: %d search_flag: %d", - info,inx,search_flag)); + DBUG_PRINT("enter", ("base: %p buf: %p inx: %d search_flag: %d", + info, buf, inx, search_flag)); if ((inx = _mi_check_index(info,inx)) < 0) DBUG_RETURN(my_errno); @@ -56,9 +56,12 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, { if (key_len == 0) key_len=USE_WHOLE_KEY; + /* Save the packed key for later use in the second buffer of lastkey. */ key_buff=info->lastkey+info->s->base.max_key_length; pack_key_length=_mi_pack_key(info,(uint) inx, key_buff, (uchar*) key, key_len, &last_used_keyseg); + /* Save packed_key_length for use by the MERGE engine. */ + info->pack_key_length= pack_key_length; DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE, keyinfo->seg, key_buff, pack_key_length);); } |