database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-20175 Move Type_handler_row from Type_collection_std to Type_collection_row

Browse Source
This commit is contained in:
Alexander Barkov
2019-07-25 04:38:05 +04:00
parent 5cc2096f93
commit 061a0f0b8d
12 changed files with 198 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_type.h
View File

@ -3314,7 +3314,7 @@ public:
*/
virtual enum_field_types traditional_merge_field_type() const
{
DBUG_ASSERT(is_traditional_type());
DBUG_ASSERT(is_traditional_scalar_type());
return field_type();
}
virtual enum_field_types type_code_for_protocol() const
@ -3413,13 +3413,10 @@ public:
}
virtual ~Type_handler() {}
/**
Determines MariaDB traditional data types that always present
Determines MariaDB traditional scalar data types that always present
in the server.
*/
virtual bool is_traditional_type() const
{
return true;
}
bool is_traditional_scalar_type() const;
virtual bool is_scalar_type() const { return true; }
virtual bool can_return_int() const { return true; }
virtual bool can_return_decimal() const { return true; }
@ -3899,6 +3896,7 @@ public:
DBUG_ASSERT(0);
return true;
}
const Type_collection *type_collection() const override;
bool is_scalar_type() const { return false; }
bool can_return_int() const { return false; }
bool can_return_decimal() const { return false; }