1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
This commit is contained in:
unknown 2004-05-06 01:06:18 +04:00
commit cd57fc8bda
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item.cc
View File

@ -745,6 +745,8 @@ double Item_param::val()
{
DBUG_ASSERT(value_is_set == 1);
int err;
if (null_value)
return 0.0;
switch (item_result_type) {
case STRING_RESULT:
return (double) my_strntod(str_value.charset(), (char*) str_value.ptr(),
@ -761,6 +763,8 @@ longlong Item_param::val_int()
{
DBUG_ASSERT(value_is_set == 1);
int err;
if (null_value)
return 0;
switch (item_result_type) {
case STRING_RESULT:
return my_strntoll(str_value.charset(),

1
sql/item.h
View File

@ -157,6 +157,7 @@ public:
virtual Item_result result_type () const { return REAL_RESULT; }
virtual enum_field_types field_type() const;
virtual enum Type type() const =0;
/* valXXX methods must return NULL or 0 or 0.0 if null_value is set. */
virtual double val()=0;
virtual longlong val_int()=0;
virtual String *val_str(String*)=0;