diff options
| author | unknown <bar@mysql.com> | 2005-02-18 16:10:12 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-18 16:10:12 +0400 |
| commit | cfa78c2645d3a0c3eaf02a256f63d2d284ed2b3b (patch) | |
| tree | 53799b508e8232f507f797d3f2a74934878591a0 /myisam | |
| parent | 5b91c5a73c778bd0e93220534493bacaba0c292c (diff) | |
| download | mariadb-git-cfa78c2645d3a0c3eaf02a256f63d2d284ed2b3b.tar.gz | |
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_rnext_same.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c index a50c578e081..06408f57a3f 100644 --- a/myisam/mi_rnext_same.c +++ b/myisam/mi_rnext_same.c @@ -57,7 +57,11 @@ int mi_rnext_same(MI_INFO *info, byte *buf) #endif case HA_KEY_ALG_BTREE: default: - memcpy(info->lastkey2,info->lastkey,info->last_rkey_length); + if (!(info->update & HA_STATE_RNEXT_SAME)) + { + /* First rnext_same; Store old key */ + memcpy(info->lastkey2,info->lastkey,info->last_rkey_length); + } for (;;) { if ((error=_mi_search_next(info,keyinfo,info->lastkey, @@ -81,7 +85,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) rw_unlock(&info->s->key_root_lock[inx]); /* Don't clear if database-changed */ info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); - info->update|= HA_STATE_NEXT_FOUND; + info->update|= HA_STATE_NEXT_FOUND | HA_STATE_RNEXT_SAME; if (error) { |