diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-17 00:45:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-17 00:45:02 +0100 |
| commit | 8f102b584d4e8f02da924f9be094014136eb453f (patch) | |
| tree | 80e98303b2960d477e1e2223b0a986f5fd6edf0a /sql/field.cc | |
| parent | 715a507e3368451b824f211dea34a55c5d4dac1d (diff) | |
| parent | d87531a6a053fdf8bc828857d9cdc11a97026ad6 (diff) | |
| download | mariadb-git-8f102b584d4e8f02da924f9be094014136eb453f.tar.gz | |
Merge branch 'github/10.3' into bb-10.3-temporalmariadb-10.3.4
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 642ad6a65e9..8de823cee7c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8533,6 +8533,7 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length) @return New pointer into memory based on from + length of the data */ + const uchar *Field_blob::unpack(uchar *to, const uchar *from, const uchar *from_end, uint param_data) { @@ -8548,7 +8549,6 @@ const uchar *Field_blob::unpack(uchar *to, const uchar *from, if (from + master_packlength + length > from_end) DBUG_RETURN(0); set_ptr(length, const_cast<uchar*> (from) + master_packlength); - DBUG_DUMP("record", to, table->s->reclength); DBUG_RETURN(from + master_packlength + length); } |