diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
| commit | 9936cfd531a49b0ba124c4eb38a6099ec420c7fd (patch) | |
| tree | 52e3c6dd19846b7ff0d895c31e78bc1e781ca780 /sql/field.cc | |
| parent | a7634281aa64a549d19cd20ead7e80d0267271ee (diff) | |
| parent | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (diff) | |
| download | mariadb-git-9936cfd531a49b0ba124c4eb38a6099ec420c7fd.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 15356274864..ea752d33a20 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -57,7 +57,7 @@ const char field_separator=','; #define BLOB_PACK_LENGTH_TO_MAX_LENGH(arg) \ ((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) -// Column marked for read or the field set to read out or record[0] or [1] +// Column marked for read or the field set to read out of record[0] inline bool Field::marked_for_read() const { return !table || @@ -68,7 +68,7 @@ inline bool Field::marked_for_read() const } /* - The name of this function is a bit missleading as in 10.4 we don't + The name of this function is a bit misleading as in 10.4 we don't have to test anymore if the field is computed. Instead we mark changed fields with DBUG_FIX_WRITE_SET() in table.cc */ |