diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-14 20:27:00 +0400 |
| commit | afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4 (patch) | |
| tree | 8755d77c5aca99ddc5bafc874e5f550be85e6f45 /sql/field_conv.cc | |
| parent | e86010f909fb6b8c4ffd9d6df92991ac079e67e7 (diff) | |
| download | mariadb-git-afe6eb499d7d5d9b4ba9de5746e78b43f25e31a4.tar.gz | |
Revert "MDEV-20342 Turn Field::flags from a member to a method"
This reverts commit e86010f909fb6b8c4ffd9d6df92991ac079e67e7.
Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 7fa6ecc4428..bcd4c5fbb38 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -400,7 +400,8 @@ static void do_field_varbinary_pre50(Copy_field *copy) void Field::do_field_int(Copy_field *copy) { longlong value= copy->from_field->val_int(); - copy->to_field->store(value, copy->from_field->is_unsigned()); + copy->to_field->store(value, + MY_TEST(copy->from_field->flags & UNSIGNED_FLAG)); } void Field::do_field_real(Copy_field *copy) @@ -715,7 +716,7 @@ void Copy_field::set(Field *to,Field *from,bool save) else do_copy=0; - if ((to->flags() & BLOB_FLAG) && save) + if ((to->flags & BLOB_FLAG) && save) do_copy2= do_save_blob; else do_copy2= to->get_copy_func(from); |