summaryrefslogtreecommitdiff
path: root/sql/sp_pcontext.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-11-26 15:04:55 +0400
committerAlexander Barkov <bar@mariadb.org>2015-11-26 15:04:55 +0400
commitcc8e8633907427da0807734d99f2c5452d889c3c (patch)
treef518512ddbaedfc4d6a09d5c758884b82498c3a3 /sql/sp_pcontext.h
parentb50fa6dab2d2c00dc253ec9f22f3de9fec1105e9 (diff)
downloadmariadb-git-cc8e8633907427da0807734d99f2c5452d889c3c.tar.gz
Removing sp_variable::type, as it was always set to the same value with
sp_variable::field_def.type, so there was data redundancy.
Diffstat (limited to 'sql/sp_pcontext.h')
-rw-r--r--sql/sp_pcontext.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index c15d6bc7016..2a080536b8a 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -43,9 +43,6 @@ public:
/// Name of the SP-variable.
LEX_STRING name;
- /// Field-type of the SP-variable.
- enum enum_field_types type;
-
/// Mode of the SP-variable.
enum_mode mode;
@@ -62,11 +59,12 @@ public:
/// Full type information (field meta-data) of the SP-variable.
Column_definition field_def;
+ /// Field-type of the SP-variable.
+ enum_field_types sql_type() const { return field_def.sql_type; }
public:
sp_variable(LEX_STRING _name, uint _offset)
:Sql_alloc(),
name(_name),
- type(MYSQL_TYPE_NULL),
mode(MODE_IN),
offset(_offset),
default_value(NULL)