diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
| commit | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (patch) | |
| tree | bf55c043320485e4ce5c8be90c8d619b481a0306 /sql/field.cc | |
| parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
| parent | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (diff) | |
| download | mariadb-git-f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7.tar.gz | |
merge 5.5->10.0-base
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 64d625cc9cd..1e025784617 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7222,7 +7222,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, &from, sizeof(char*)); + bmove(ptr + packlength, &from, sizeof(char*)); return 0; } if (tmpstr.copy(from, length, cs)) |