database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

cleanup: rename a method

Browse Source
This commit is contained in:
Sergei Golubchik
2016-01-13 13:42:46 +01:00
parent 46ae210422
commit 03a0623f1e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/field.h
View File

@@ -1393,7 +1393,7 @@ public:
- If field is char/varchar/.. and is not part of write set. - If field is char/varchar/.. and is not part of write set.
TRUE - If field is char/varchar/.. and is part of write set. TRUE - If field is char/varchar/.. and is part of write set.
*/ */
virtual bool is_updatable() const { return FALSE; } virtual bool is_varchar_and_in_write_set() const { return FALSE; }
/* Check whether the field can be used as a join attribute in hash join */ /* Check whether the field can be used as a join attribute in hash join */
virtual bool hash_join_is_possible() { return TRUE; } virtual bool hash_join_is_possible() { return TRUE; }
@@ -1702,7 +1702,7 @@ public:
int store_decimal(const my_decimal *d); int store_decimal(const my_decimal *d);
uint32 max_data_length() const; uint32 max_data_length() const;
bool is_updatable() const bool is_varchar_and_in_write_set() const
{ {
DBUG_ASSERT(table && table->write_set); DBUG_ASSERT(table && table->write_set);
return bitmap_is_set(table->write_set, field_index); return bitmap_is_set(table->write_set, field_index);
@@ -3204,7 +3204,8 @@ public:
int store_field(Field *from) int store_field(Field *from)
{ // Be sure the value is stored { // Be sure the value is stored
from->val_str(&value); from->val_str(&value);
if (table->copy_blobs || (!value.is_alloced() && from->is_updatable())) if (table->copy_blobs ||
(!value.is_alloced() && from->is_varchar_and_in_write_set()))
value.copy(); value.copy();
return store(value.ptr(), value.length(), from->charset()); return store(value.ptr(), value.length(), from->charset());
} }