database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

5.1 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-01-21 09:41:28 +01:00
parent 7e431dc379 c0065d1539
commit aa2f88baa0
13 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

@ -7708,7 +7708,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))
@ -8363,7 +8363,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;