summaryrefslogtreecommitdiff
path: root/sql/procedure.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-11 09:18:43 +0200
committermonty@mashka.mysql.fi <>2002-12-11 09:18:43 +0200
commita241d9a0f7c1a00c143adb98e2e251f324391430 (patch)
tree6269df71542c5b73ad0eb4740601b29234482f8f /sql/procedure.h
parent48aa519fe7eb8203a6ce7ff2b4b4ddfca7ac2dc9 (diff)
parentd3eb993a27a973842d84d83db80e827a1f8948e2 (diff)
downloadmariadb-git-a241d9a0f7c1a00c143adb98e2e251f324391430.tar.gz
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql/procedure.h')
-rw-r--r--sql/procedure.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/procedure.h b/sql/procedure.h
index b72c5cb559f..bc1b6062e1d 100644
--- a/sql/procedure.h
+++ b/sql/procedure.h
@@ -55,7 +55,7 @@ public:
decimals=dec; max_length=float_length(dec);
}
enum Item_result result_type () const { return REAL_RESULT; }
- enum_field_types field_type() const { return FIELD_TYPE_DOUBLE; }
+ enum_field_types field_type() const { return MYSQL_TYPE_DOUBLE; }
void set(double nr) { value=nr; }
void set(longlong nr) { value=(double) nr; }
void set(const char *str,uint length,CHARSET_INFO *cs)
@@ -73,7 +73,7 @@ public:
Item_proc_int(const char *name_par) :Item_proc(name_par)
{ max_length=11; }
enum Item_result result_type () const { return INT_RESULT; }
- enum_field_types field_type() const { return FIELD_TYPE_LONG; }
+ enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
void set(double nr) { value=(longlong) nr; }
void set(longlong nr) { value=nr; }
void set(const char *str,uint length, CHARSET_INFO *cs)
@@ -91,7 +91,7 @@ public:
Item_proc_string(const char *name_par,uint length) :Item_proc(name_par)
{ this->max_length=length; }
enum Item_result result_type () const { return STRING_RESULT; }
- enum_field_types field_type() const { return FIELD_TYPE_STRING; }
+ enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
void set(double nr) { str_value.set(nr, 2, thd_charset()); }
void set(longlong nr) { str_value.set(nr, thd_charset()); }
void set(const char *str, uint length, CHARSET_INFO *cs)