summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-02-27 19:08:52 +0100
committerunknown <pem@mysql.com>2003-02-27 19:08:52 +0100
commitaecc6a21bd1e802d31318cf3e82d03d57b090c5f (patch)
treeb7efe78983c562d9dd31ef6ae9f1c7728e01aca8 /sql/item_func.h
parent76b037dc4288fada1b64efbef422cb8b4bd0d5b5 (diff)
downloadmariadb-git-aecc6a21bd1e802d31318cf3e82d03d57b090c5f.tar.gz
A small step forward. Fixed a few bugs and made string type functions work,
but still strange interferences between multiple function invocations... mysql-test/r/sp.result: New FUNCTION tests. mysql-test/t/sp.test: New FUNCTION tests. sql/item_func.cc: Fixed field_type bug; now string functions work too. Removed unecessary function which was added in a state of confusion. sql/item_func.h: Fixed field_type bug; now string functions work too. Removed unecessary function which was added in a state of confusion. sql/sp_head.cc: Fixed string type bug, and set the right charset.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 07201093473..00794b048a2 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1161,7 +1161,7 @@ class Item_func_sp :public Item_func
{
private:
LEX_STRING m_name;
- sp_head *m_sp;
+ mutable sp_head *m_sp;
int execute(Item **itp);
@@ -1183,6 +1183,8 @@ public:
return m_name.str;
}
+ enum enum_field_types field_type() const;
+
Item_result result_type() const;
longlong val_int()
@@ -1208,8 +1210,6 @@ public:
return it->val_str(str);
}
- void make_field(Send_field *field);
-
void fix_length_and_dec();
};