Skip to content

M
MariaDB
Commit f5833a4e authored by Alexey Botchkov's avatar Alexey Botchkov
Browse files
Options

Merge branch '10.5' into bb-10.5-hf

parents 241b4a30 dba7ae5f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/field.cc
View file @ f5833a4e
...@@ -58,7 +58,7 @@ const char field_separator=','; ...@@ -58,7 +58,7 @@ const char field_separator=',';
((ulong) ((1LL << MY_MIN(arg, 4) * 8) - 1)) ((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 or record[0] or [1]
inline bool Field::marked_for_read() const bool Field::marked_for_read() const
{ {
return !table || return !table ||
(!table->read_set || (!table->read_set ||
...@@ -73,7 +73,7 @@ inline bool Field::marked_for_read() const ...@@ -73,7 +73,7 @@ inline bool Field::marked_for_read() const
changed fields with DBUG_FIX_WRITE_SET() in table.cc 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 || return (!table ||
(!table->write_set || (!table->write_set ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7