summaryrefslogtreecommitdiff
path: root/myisam/mi_key.c
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-07-18 04:04:24 +0300
committerunknown <monty@narttu.mysql.fi>2003-07-18 04:04:24 +0300
commit06517dfed3505981105d892e036e36d32c23c9aa (patch)
tree6daa5670b9fcf6d6a667f2f4af5a9ac7e1d44770 /myisam/mi_key.c
parent6159cd27bfe9d24e610c7a25f8e0d991abd9caff (diff)
downloadmariadb-git-06517dfed3505981105d892e036e36d32c23c9aa.tar.gz
Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR
myisam/mi_check.c: Fixed memory overrun in _mi_put_key_in_record myisam/mi_key.c: Fixed unnecessary memory allocation mysql-test/r/insert_select.result: Added test case for memory corruption mysql-test/t/insert_select.test: Added test case for memory corruption mysys/safemalloc.c: Removed compiler warnings sql/sql_acl.cc: Fixed core dump when running with --debug
Diffstat (limited to 'myisam/mi_key.c')
-rw-r--r--myisam/mi_key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 5b167cc9ab0..89f6bc490fa 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -264,7 +264,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
byte *blob_ptr;
DBUG_ENTER("_mi_put_key_in_record");
- if (info->blobs && info->s->keyinfo[keynr].flag & HA_VAR_LENGTH_KEY)
+ if (info->s->base.blobs && info->s->keyinfo[keynr].flag & HA_VAR_LENGTH_KEY)
{
if (!(blob_ptr=
mi_alloc_rec_buff(info, info->s->keyinfo[keynr].keylength,