diff options
| author | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-15 14:09:45 +0200 |
| commit | 0a1076a25f897e4c383cdc5be6b713e65077496b (patch) | |
| tree | e8856cd37d5a43bd18c06a8834fbfff83c0f4998 /heap/hp_write.c | |
| parent | 97b28521e6f2735ee6488682b15071f604f66cfd (diff) | |
| parent | f34bc883ab4beda7ffd295a89ba62a30f8ccc0e5 (diff) | |
| download | mariadb-git-0a1076a25f897e4c383cdc5be6b713e65077496b.tar.gz | |
Merge with 4.1
Diffstat (limited to 'heap/hp_write.c')
| -rw-r--r-- | heap/hp_write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 171998e9125..a60d32eecb6 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -143,7 +143,8 @@ static byte *next_free_record_pos(HP_SHARE *info) } if (!(block_pos=(info->records % info->block.records_in_block))) { - if (info->records > info->max_records && info->max_records) + if ((info->records > info->max_records && info->max_records) || + (info->data_length + info->index_length >= info->max_table_size)) { my_errno=HA_ERR_RECORD_FILE_FULL; DBUG_RETURN(NULL); |