summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2013-06-14 10:52:23 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2013-06-14 10:52:23 +0200
commita040586cceab693b5b689afff841c785afa38e53 (patch)
tree635f7a3d45ec27024d2f7e63e79da82fdeb47273 /sql/field.cc
parent9f7043ab91197decf382553e156aabc87d5f7451 (diff)
downloadmariadb-git-a040586cceab693b5b689afff841c785afa38e53.tar.gz
Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8
Backport to 5.5 (external Bug#69407 Build warnings with mysql)
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 749d5d8047e..c65346423a0 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2000, 2012, 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
@@ -7380,7 +7380,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
{
Field_blob::store_length(length);
- bmove(ptr+packlength,(char*) &from,sizeof(char*));
+ bmove(ptr+packlength, &from, sizeof(char*));
return 0;
}
if (tmpstr.copy(from, length, cs))
@@ -7897,7 +7897,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
value.copy(from, length, cs);
from= value.ptr();
}
- bmove(ptr + packlength, (char*) &from, sizeof(char*));
+ bmove(ptr + packlength, &from, sizeof(char*));
}
return 0;