diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 17:50:13 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 17:50:13 +0200 |
| commit | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (patch) | |
| tree | b7cfbdb5dc2bda809543ae84ca60d7f79227399e /storage/maria/ma_key.c | |
| parent | 883af99e7dac91e3f258135a2053e6b8e3c05fc3 (diff) | |
| download | mariadb-git-5ce11d8b4ca2a57968656925a69ed8114d5374f6.tar.gz | |
MariaDB made be compiled by gcc 4.8.1
There was 2 problems:
1) coping/moving of the same type (usually casting) as sizeof() (solved in different ways depends on the cause);
2) using 'const' in SSL_CTX::getVerifyCallback() which return object (not reference) and so copy of the object will be created and 'const' has no sens.
Diffstat (limited to 'storage/maria/ma_key.c')
| -rw-r--r-- | storage/maria/ma_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_key.c b/storage/maria/ma_key.c index 1e60e6a8c06..d0efc8fd43d 100644 --- a/storage/maria/ma_key.c +++ b/storage/maria/ma_key.c @@ -589,7 +589,7 @@ static int _ma_put_key_in_record(register MARIA_HA *info, uint keynr, if (unpack_blobs) { memcpy(record+keyseg->start+keyseg->bit_start, - (char*) &blob_ptr,sizeof(char*)); + &blob_ptr, sizeof(char*)); memcpy(blob_ptr,key,length); blob_ptr+=length; |