diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:17:50 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:17:50 -0600 |
| commit | ce5f0d1bc3ced3ea987d5fcb2f64204cb5c17661 (patch) | |
| tree | e1f124ea0e96bfa5ff03cb4885b9f2dde79eb0d4 /sql/item.h | |
| parent | db18dc9da096bdd0adf5d8b89896d6b041ee7f30 (diff) | |
| parent | 75392f37078a8e3bf3098f40c84a24c18cd91d5b (diff) | |
| download | mariadb-git-ce5f0d1bc3ced3ea987d5fcb2f64204cb5c17661.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/outfile.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/my_decimal.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index f38ce2f5db0..11dce3a7758 100644 --- a/sql/item.h +++ b/sql/item.h @@ -946,7 +946,7 @@ class Item_splocal :public Item_sp_variable, Type m_type; Item_result m_result_type; - + enum_field_types m_field_type; public: /* Position of this reference to SP variable in the statement (the @@ -978,6 +978,7 @@ public: inline enum Type type() const; inline Item_result result_type() const; + inline enum_field_types field_type() const { return m_field_type; } private: bool set_value(THD *thd, sp_rcontext *ctx, Item **it); |