diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
| commit | aeeafbb39656fc4678c72b00f958215754b32dc7 (patch) | |
| tree | 512613b578f3b028a4c6b6272b2dc4820676ad8b /storage/myisam/mi_log.c | |
| parent | efc8a279356bd2afd8d6af341f7cf80860475efd (diff) | |
| parent | 81906cdf3805fe5fcea47fef11945f9adbcef4d8 (diff) | |
| download | mariadb-git-aeeafbb39656fc4678c72b00f958215754b32dc7.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'storage/myisam/mi_log.c')
| -rw-r--r-- | storage/myisam/mi_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_log.c b/storage/myisam/mi_log.c index f6bbaab1f87..5af4a057a95 100644 --- a/storage/myisam/mi_log.c +++ b/storage/myisam/mi_log.c @@ -149,7 +149,7 @@ void _myisam_log_record(enum myisam_log_commands command, MI_INFO *info, blob != end ; blob++) { - memcpy_fixed((uchar*) &pos, record+blob->offset+blob->pack_length, + memcpy(&pos, record+blob->offset+blob->pack_length, sizeof(char*)); (void) mysql_file_write(myisam_log_file, pos, blob->length, MYF(0)); } |