diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
| commit | e63c03db8d620765b7a1bc769150a04a230b9353 (patch) | |
| tree | 889476c5e3cf759c2abde780f91e1c61c3064492 /storage/myisam | |
| parent | 70c08df4dc6899991c29c4db3253d8e4efc4ee77 (diff) | |
| parent | 172784965981c7d06ddb50457f0178da25104b9e (diff) | |
| download | mariadb-git-e63c03db8d620765b7a1bc769150a04a230b9353.tar.gz | |
Merge with 10.0-base
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_check.c | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_checksum.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 86b7b1875bd..3a2bdb2e899 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -1536,7 +1536,7 @@ int mi_repair(HA_CHECK *param, register MI_INFO *info, if (!param->using_global_keycache) (void) init_key_cache(dflt_key_cache, param->key_cache_block_size, - param->use_buffers, 0, 0, 0); + (size_t) param->use_buffers, 0, 0, 0); if (init_io_cache(¶m->read_cache,info->dfile, (uint) param->read_buffer_length, diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c index b89fd996ba1..baee85566c2 100644 --- a/storage/myisam/mi_checksum.c +++ b/storage/myisam/mi_checksum.c @@ -40,7 +40,7 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf) length=_mi_calc_blob_length(column->length- portable_sizeof_char_ptr, buf); - memcpy(&pos, buf+column->length - portable_sizeof_char_ptr, + memcpy((void*) &pos, buf+column->length - portable_sizeof_char_ptr, sizeof(char*)); break; } |