diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 12:08:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 12:08:28 +0300 |
| commit | dba7ae5fdb915668de814322e3402c41b6c9b1c2 (patch) | |
| tree | 49c6a76bea71ff3990946b365c8515b618daf736 /sql/field.cc | |
| parent | 312ba3cc3dd13fe3da1aeac8a32887be98c8a7ae (diff) | |
| download | mariadb-git-dba7ae5fdb915668de814322e3402c41b6c9b1c2.tar.gz | |
MDEV-274: Fix unresolved link-time references
Field::marked_for_read() and Field::marked_for_write_or_computed()
are being called from plugin/type_inet/sql_type_inet.cc ever since
commit 6ea5c2b5b6725ba77e97c4c06d7501721c04a8d2
and thus they cannot be declared inline any more.
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 ac48db9b725..01220d7205a 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -58,7 +58,7 @@ const char field_separator=','; ((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) // Column marked for read or the field set to read out or record[0] or [1] -inline bool Field::marked_for_read() const +bool Field::marked_for_read() const { return !table || (!table->read_set || @@ -73,7 +73,7 @@ inline bool Field::marked_for_read() const changed fields with DBUG_FIX_WRITE_SET() in table.cc */ -inline bool Field::marked_for_write_or_computed() const +bool Field::marked_for_write_or_computed() const { return (!table || (!table->write_set || |