From 3648b333c74b5c36776db30a4370bafa28a73ef0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 9 Jun 2021 18:31:23 +0200 Subject: cleanup: formatting also avoid an oxymoron of using `MYSQL_PLUGIN_IMPORT` under `#ifdef MYSQL_SERVER`, and empty_clex_str is so trivial that a plugin can define it if needed. --- sql/field.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'sql/field.h') diff --git a/sql/field.h b/sql/field.h index 08a334e5a6f..e5f47300ca7 100644 --- a/sql/field.h +++ b/sql/field.h @@ -4805,14 +4805,11 @@ private: class Field_set final :public Field_enum { public: Field_set(uchar *ptr_arg, uint32 len_arg, uchar *null_ptr_arg, - uchar null_bit_arg, - enum utype unireg_check_arg, const LEX_CSTRING *field_name_arg, - uint32 packlength_arg, + uchar null_bit_arg, enum utype unireg_check_arg, + const LEX_CSTRING *field_name_arg, uint32 packlength_arg, const TYPELIB *typelib_arg, const DTCollation &collation) - :Field_enum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, - unireg_check_arg, field_name_arg, - packlength_arg, - typelib_arg, collation), + :Field_enum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, unireg_check_arg, + field_name_arg, packlength_arg, typelib_arg, collation), empty_set_string("", 0, collation.collation) { flags=(flags & ~ENUM_FLAG) | SET_FLAG; -- cgit v1.2.1