summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-21 00:11:50 +0200
committermonty@mysql.com <>2003-11-21 00:11:50 +0200
commit41eda1c949671be87631255df355530da4efb745 (patch)
tree4cd9739fe1fd00afa4e9117b8d45599375b500cb /sql
parentdd287a4cdf4b8937ce428678fa096134a5ae8a88 (diff)
downloadmariadb-git-41eda1c949671be87631255df355530da4efb745.tar.gz
Revert patch for bigint handling in double context as it broke normal bigint handling
The right way to fix this is to change the Field::store(longlong) method to be Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/item.cc12
-rw-r--r--sql/item.h1
2 files changed, 0 insertions, 13 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 65eb7f1befd..fc6256d4fed 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -548,18 +548,6 @@ bool Item_string::save_in_field(Field *field, bool no_conversions)
return 0;
}
-bool Item_uint::save_in_field(Field *field, bool no_conversions)
-{
- longlong nr=val_int();
- if (null_value)
- return set_field_to_null(field);
- field->set_notnull();
- if (nr < 0)
- field->store(ulonglong2double(nr));
- else
- field->store(nr);
- return 0;
-}
bool Item_int::save_in_field(Field *field, bool no_conversions)
{
diff --git a/sql/item.h b/sql/item.h
index d23a061eedb..e8a6313b6a0 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -232,7 +232,6 @@ public:
String *val_str(String*);
void make_field(Send_field *field);
Item *new_item() { return new Item_uint(name,max_length); }
- bool save_in_field(Field *field, bool no_conversions);
bool fix_fields(THD *thd,struct st_table_list *table_list)
{
unsigned_flag= 1;