Skip to content

Commit 5c87e68

Browse files
villint
1 parent f5e8fb0 commit 5c87e68

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sql/field_conv.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
#include "sql/current_thd.h"
5151
#include "sql/field.h"
5252
#include "sql/item_timefunc.h" // Item_func_now_local
53-
#include "sql/sql_class.h" // THD
53+
#include "sql/log.h"
54+
#include "sql/sql_class.h" // THD
5455
#include "sql/sql_const.h"
5556
#include "sql/sql_error.h"
5657
#include "sql/sql_time.h"
5758
#include "sql/system_variables.h"
5859
#include "sql/table.h"
5960
#include "sql_string.h"
6061
#include "template_utils.h" // down_cast
61-
#include "sql/log.h"
6262
#include "villagesql/types/util.h"
6363

6464
/**
@@ -327,13 +327,13 @@ static void do_field_string(Copy_field *, const Field *from_field,
327327

328328
// VillageSQL: Copy from a custom type field to custom type field.
329329
static void do_field_custom_to_custom(Copy_field *, const Field *from_field,
330-
Field *to_field) {
330+
Field *to_field) {
331331
villagesql::CopyCustomToCustomField(from_field, to_field);
332332
}
333333

334334
// VillageSQL: Copy from a custom type field to string field.
335335
static void do_field_custom_to_string(Copy_field *, const Field *from_field,
336-
Field *to_field) {
336+
Field *to_field) {
337337
villagesql::CopyCustomToStringField(from_field, to_field);
338338
}
339339

0 commit comments

Comments
 (0)