diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
| commit | c94ccb237e5f8b0f72c742746aa49f8ff8440f98 (patch) | |
| tree | 635f7a3d45ec27024d2f7e63e79da82fdeb47273 /storage/myisam/mi_packrec.c | |
| parent | d0e586763a728fe7eb501df1effe2a4841a62e11 (diff) | |
| download | mariadb-git-c94ccb237e5f8b0f72c742746aa49f8ff8440f98.tar.gz | |
Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8
Backport to 5.5
(external Bug#69407 Build warnings with mysql)
support-files/build-tags:
Run etags on sql_yacc.yy, ignore other .yy files
unittest/mysys/explain_filename-t.cc:
NO_PLAN seems to fail on some platforms, use the actual number instead.
Diffstat (limited to 'storage/myisam/mi_packrec.c')
| -rw-r--r-- | storage/myisam/mi_packrec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index a1a03e20aaf..8548b3ebd94 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1051,7 +1051,7 @@ static void uf_blob(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, } decode_bytes(rec,bit_buff,bit_buff->blob_pos,bit_buff->blob_pos+length); _my_store_blob_length((uchar*) to,pack_length,length); - memcpy((char*) to+pack_length, &bit_buff->blob_pos, sizeof(char*)); + memcpy(to+pack_length, &bit_buff->blob_pos, sizeof(char*)); bit_buff->blob_pos+=length; } } |