diff options
| author | unknown <ramil@mysql.com> | 2005-04-26 19:57:15 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-04-26 19:57:15 +0500 |
| commit | e7243a945603ad281729a87e34d74400acb02af4 (patch) | |
| tree | 8a8a5148547589c9a48a4bb660dae088bdaec6fe /myisam | |
| parent | 0cb38f647aad045e6f22f6a9960e314741c58b5a (diff) | |
| parent | 86d285197ab517ccd16a2175881ee51b5e0dde40 (diff) | |
| download | mariadb-git-e7243a945603ad281729a87e34d74400acb02af4.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b9489
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_key.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c index ab5ddd3a378..d7d10e116aa 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -242,7 +242,10 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, { k_length-=length; if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART)) + { k_length-=2; /* Skip length */ + old+= 2; + } continue; /* Found NULL */ } } |