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 | a6ccad60b46d25e4bf0833262f1b96ba2712c7a4 (patch) | |
| tree | 4007055b2807d30f793f20e8d986f32a0332b570 /storage | |
| parent | 7dc42f175f04adf379ac0cb35c09c39c8cd07640 (diff) | |
| parent | cb07978da9a24244cf71d9be86eeb794088f67c7 (diff) | |
| download | mariadb-git-a6ccad60b46d25e4bf0833262f1b96ba2712c7a4.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 1845859ec81..cf290e2018a 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1807,7 +1807,7 @@ int ha_myisam::info(uint flag) if (share->key_parts) memcpy((char*) table->key_info[0].rec_per_key, (char*) misam_info.rec_per_key, - sizeof(table->key_info[0].rec_per_key[0])*share->key_parts); + sizeof(table->key_info[0].rec_per_key[0])*share->key_parts); if (share->tmp_table == NO_TMP_TABLE) pthread_mutex_unlock(&share->mutex); 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)); } } |