1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A cleanup for MDEV-19923 Add type handlers for geometry sub-types

Browse Source 
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
This commit is contained in:
Alexander Barkov 2019-07-03 18:02:22 +04:00
parent b511202335
commit 7b5bfa53aa
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.cc
View File

@ -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) bool Key_part_spec::init_multiple_key_for_blob(const handler *file)
{ {
if (check_key_for_blob(file)) if (check_key_for_blob(file))

10
sql/sql_class.h
View File

@ -290,15 +290,7 @@ public:
Key_part_spec *clone(MEM_ROOT *mem_root) const Key_part_spec *clone(MEM_ROOT *mem_root) const
{ return new (mem_root) Key_part_spec(*this); } { return new (mem_root) Key_part_spec(*this); }
bool check_key_for_blob(const class handler *file) const; bool check_key_for_blob(const class handler *file) const;
bool check_key_length_for_blob() 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_primary_key_for_blob(const class handler *file) const bool check_primary_key_for_blob(const class handler *file) const
{ {
return check_key_for_blob(file) || check_key_length_for_blob(); return check_key_for_blob(file) || check_key_length_for_blob();