diff options
| author | monty@donna.mysql.com <> | 2001-01-08 00:04:30 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-08 00:04:30 +0200 |
| commit | 6d0e529042f175d4a0522235239f33e8eca41cfb (patch) | |
| tree | 500feaf42e43ee02e3822a280b03319bcd8f3abe /myisam/mi_delete.c | |
| parent | 7541a877bcc007f58cb218fe18a4f4b18c7ba71a (diff) | |
| download | mariadb-git-6d0e529042f175d4a0522235239f33e8eca41cfb.tar.gz | |
Fixed bug when having many binary log files
Fixed bug when deleting keys with possible NULL values
many changes to mysqltest
Diffstat (limited to 'myisam/mi_delete.c')
| -rw-r--r-- | myisam/mi_delete.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index f8bc37d8e20..445e745b07d 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -707,9 +707,10 @@ static uint remove_key(MI_KEYDEF *keyinfo, uint nod_flag, } else { - /* A variable length first key part */ - if (*keypos & 128) /* Next key is packed */ + /* Check if a variable length first key part */ + if ((keyinfo->seg->flag & HA_PACK_KEY) && *keypos & 128) { + /* Next key is packed against the current one */ uint next_length,prev_length,prev_pack_length,lastkey_length, rest_length; if (keyinfo->seg[0].length >= 127) |