parser cleanup: don't store field properties in LEX, use Create_field directly

length/dec/charset are still in LEX, because they're also used
for CAST and dynamic columns.

also
1. fix "MDEV-7041 COLLATION(CAST('a' AS CHAR BINARY)) returns a wrong result"
2. allow BINARY modifier in stored function RETURN clause
3. allow "COLLATION without CHARSET" in SP/SF (parameters, RETURN, DECLARE)
4. print correct variable name in error messages for stored routine parameters

1 files changed, 4 insertions, 10 deletions

diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index 4d8623108aa..efe9531c3a0 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -63,12 +63,11 @@ public:
   Create_field field_def;
 
 public:
-  sp_variable(LEX_STRING _name, enum_field_types _type, enum_mode _mode,
-              uint _offset)
+  sp_variable(LEX_STRING _name, uint _offset)
    :Sql_alloc(),
     name(_name),
-    type(_type),
-    mode(_mode),
+    type(MYSQL_TYPE_NULL),
+    mode(MODE_IN),
     offset(_offset),
     default_value(NULL)
   { }
@@ -340,14 +339,9 @@ public:
   ///
   /// @param thd  Thread context.
   /// @param name Name of the SP-variable.
-  /// @param type Type of the SP-variable.
-  /// @param mode Mode of the SP-variable.
   ///
   /// @return instance of newly added SP-variable.
-  sp_variable *add_variable(THD *thd,
-                            LEX_STRING name,
-                            enum enum_field_types type,
-                            sp_variable::enum_mode mode);
+  sp_variable *add_variable(THD *thd, LEX_STRING name);
 
   /// Retrieve full type information about SP-variables in this parsing
   /// context and its children.