summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-04-05 21:27:33 +0400
committerAlexander Barkov <bar@mariadb.com>2018-04-05 21:27:33 +0400
commita1a966fc0e084494da0f4ff88d41908e094865b9 (patch)
tree676b2bbb32ff250fc670a2363eacb6ad584c213e /sql/field.cc
parentd8da97b09abec8fba2398f6ff6d84285b0752400 (diff)
downloadmariadb-git-a1a966fc0e084494da0f4ff88d41908e094865b9.tar.gz
Cleanup: renaming methods make_field(Send_field*) to make_send_field(..)
Renaming methods: - Field::make_field(Send_field*) to make_send_field(..) - Item::make_field(THD *,Send_field *) to make_send_field(..) - Item::init_make_field(Send_field *, enum_field_type) to init_make_send_field(..) These names looked similar to other functions that are used for a very different purpose (creating Field instances): - Public function "Field * make_field(..)" - Method "Field *Column_defitinion::make_field(..)" The rename makes it's easier to search the code using "grep".
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 3c59fffbd35..5b1bea4b803 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1941,7 +1941,7 @@ void Field_num::add_zerofill_and_unsigned(String &res) const
}
-void Field::make_field(Send_field *field)
+void Field::make_send_field(Send_field *field)
{
if (orig_table && orig_table->s->db.str && *orig_table->s->db.str)
{
@@ -2173,9 +2173,9 @@ bool Field_str::can_be_substituted_to_equal_item(const Context &ctx,
}
-void Field_num::make_field(Send_field *field)
+void Field_num::make_send_field(Send_field *field)
{
- Field::make_field(field);
+ Field::make_send_field(field);
field->decimals= dec;
}
@@ -5478,9 +5478,9 @@ int Field_timestamp_hires::cmp(const uchar *a_ptr, const uchar *b_ptr)
}
-void Field_timestamp_with_dec::make_field(Send_field *field)
+void Field_timestamp_with_dec::make_send_field(Send_field *field)
{
- Field::make_field(field);
+ Field::make_send_field(field);
field->decimals= dec;
}
@@ -6185,9 +6185,9 @@ void Field_time_hires::sort_string(uchar *to,uint length __attribute__((unused))
to[0]^= 128;
}
-void Field_time_with_dec::make_field(Send_field *field)
+void Field_time_with_dec::make_send_field(Send_field *field)
{
- Field::make_field(field);
+ Field::make_send_field(field);
field->decimals= dec;
}
@@ -6837,9 +6837,9 @@ int Field_datetime_hires::cmp(const uchar *a_ptr, const uchar *b_ptr)
return a < b ? -1 : a > b ? 1 : 0;
}
-void Field_datetime_with_dec::make_field(Send_field *field)
+void Field_datetime_with_dec::make_send_field(Send_field *field)
{
- Field::make_field(field);
+ Field::make_send_field(field);
field->decimals= dec;
}