diff options
| author | unknown <monty@mysql.com> | 2004-01-20 00:15:01 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-01-20 00:15:01 +0100 |
| commit | e44a7da25f4bc5e2be0303b527eb60a323178a68 (patch) | |
| tree | d20bcd6bae79e9d29ece05ef1bb92e9041747f39 /myisam/mi_write.c | |
| parent | 43abc597b8854c44465a8a936febe780f223628c (diff) | |
| parent | b89abbf8a154376678a3ed8a9fe6ea25b5209aba (diff) | |
| download | mariadb-git-e44a7da25f4bc5e2be0303b527eb60a323178a68.tar.gz | |
merge
myisam/mi_write.c:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 4b7a22dac84..88e7f070642 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -374,7 +374,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, my_off_t root=info->dupp_key_pos; keyinfo=&info->s->ft2_keyinfo; key+=off; - keypos-=keyinfo->keylength; /* we'll modify key entry 'in vivo' */ + keypos-=keyinfo->keylength+nod_flag; /* we'll modify key entry 'in vivo' */ error=_mi_ck_real_write_btree(info, keyinfo, key, 0, &root, comp_flag); _mi_dpointer(info, keypos+HA_FT_WLEN, root); |