From 7b5bfa53aa0bc9511a28f8d0656d9cdddb5a438f Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 3 Jul 2019 18:02:22 +0400 Subject: [PATCH] A cleanup for MDEV-19923 Add type handlers for geometry sub-types Sources did not compile in some builds because of undeclared ER_BLOB_KEY_WITHOUT_LENGTH. Moving the implementations of Key_part_spec::check_key_length_for_blob() from sql_class.h to sql_class.cc --- sql/sql_class.cc | 11 +++++++++++ sql/sql_class.h | 10 +--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0a3d0fc56e0..326b8a3f16a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -141,6 +141,17 @@ bool Key_part_spec::check_key_for_blob(const handler *file) const } +bool Key_part_spec::check_key_length_for_blob() const +{ + if (!length) + { + my_error(ER_BLOB_KEY_WITHOUT_LENGTH, MYF(0), field_name.str); + return true; + } + return false; +} + + bool Key_part_spec::init_multiple_key_for_blob(const handler *file) { if (check_key_for_blob(file)) diff --git a/sql/sql_class.h b/sql/sql_class.h index ab7f06304c2..bad9a5796f8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -290,15 +290,7 @@ public: Key_part_spec *clone(MEM_ROOT *mem_root) const { return new (mem_root) Key_part_spec(*this); } bool check_key_for_blob(const class handler *file) const; - bool check_key_length_for_blob() const - { - if (!length) - { - my_error(ER_BLOB_KEY_WITHOUT_LENGTH, MYF(0), field_name.str); - return true; - } - return false; - } + bool check_key_length_for_blob() const; bool check_primary_key_for_blob(const class handler *file) const { return check_key_for_blob(file) || check_key_length_for_blob();