summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-10-10 08:12:14 +0400
committerAlexander Barkov <bar@mariadb.com>2019-10-10 08:12:14 +0400
commit312ba3cc3dd13fe3da1aeac8a32887be98c8a7ae (patch)
tree608d138c261c1b20fea2daaa0a88b53139b3643f /sql/field_conv.cc
parentb37386d854b37743a7b4ae578312dd27bec055ce (diff)
downloadmariadb-git-312ba3cc3dd13fe3da1aeac8a32887be98c8a7ae.tar.gz
MDEV-20783 INET6 cannot be converted to BINARY(16)
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index f96c6742ea7..f975597cf70 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -30,7 +30,7 @@
#include "sql_class.h" // THD
#include <m_ctype.h>
-static void do_field_eq(Copy_field *copy)
+void Field::do_field_eq(Copy_field *copy)
{
memcpy(copy->to_ptr,copy->from_ptr,copy->from_length);
}
@@ -638,7 +638,7 @@ void Copy_field::set(uchar *to,Field *from)
else
{
to_null_ptr= 0; // For easy debugging
- do_copy= do_field_eq;
+ do_copy= Field::do_field_eq;
}
}
@@ -719,7 +719,7 @@ void Copy_field::set(Field *to,Field *from,bool save)
if ((to->flags & BLOB_FLAG) && save)
do_copy2= do_save_blob;
else
- do_copy2= to->get_copy_func(from);
+ do_copy2= from->get_copy_func_to(to);
if (!do_copy) // Not null
do_copy=do_copy2;
}