diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
| commit | fe949504f0894686d434c6fbdac25efeb965253d (patch) | |
| tree | 11bf92cdbb0c0454453c5e920d0a833cb35ecf4e /sql/field.h | |
| parent | ca906fb27361f615a1c21d5ae61c312d9ab0dd87 (diff) | |
| parent | 72c838b9fc3e5e9495d3c8e363ba85304b9db39a (diff) | |
| download | mariadb-git-fe949504f0894686d434c6fbdac25efeb965253d.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index cb8ade55090..7367e3139a2 100644 --- a/sql/field.h +++ b/sql/field.h @@ -3098,6 +3098,7 @@ private: class Field_varstring :public Field_longstr { +public: uchar *get_data() const { return ptr + length_bytes; @@ -3106,7 +3107,6 @@ class Field_varstring :public Field_longstr { { return length_bytes == 1 ? (uint) *ptr : uint2korr(ptr); } -public: /* The maximum space available in a Field_varstring, in bytes. See length_bytes. |