diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
| commit | 97ecffc8ee11863bfb3075041b85a571eafa494f (patch) | |
| tree | 1943b382cfb10d77c564c1bdb1d02b12adb88668 /sql/field.cc | |
| parent | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (diff) | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| download | mariadb-git-97ecffc8ee11863bfb3075041b85a571eafa494f.tar.gz | |
merge 10.0-base -> 10.0
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 87170b50035..755d2f8b625 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7284,7 +7284,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)) |