diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-27 15:42:19 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-27 15:42:19 +0500 |
| commit | 13919e0c9fbd4f822de27dfcf68432b6b6ded60f (patch) | |
| tree | 4007055b2807d30f793f20e8d986f32a0332b570 /storage/myisammrg | |
| parent | e9eeeea1040437cb17404ce3d116ff5e7a537859 (diff) | |
| parent | 2dc982e000dd54b604756cec6e3593a7fd2a969e (diff) | |
| download | mariadb-git-13919e0c9fbd4f822de27dfcf68432b6b6ded60f.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index 7e25309ae70..1e82983b97c 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -925,11 +925,11 @@ int ha_myisammrg::info(uint flag) with such a number, it'll be an error later anyway. */ bzero((char*) table->key_info[0].rec_per_key, - sizeof(table->key_info[0].rec_per_key) * table->s->key_parts); + sizeof(table->key_info[0].rec_per_key[0]) * table->s->key_parts); #endif memcpy((char*) table->key_info[0].rec_per_key, (char*) mrg_info.rec_per_key, - sizeof(table->key_info[0].rec_per_key) * + sizeof(table->key_info[0].rec_per_key[0]) * min(file->keys, table->s->key_parts)); } } |