summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <kostja@dipika.(none)>2008-02-08 18:51:07 +0300
committerunknown <kostja@dipika.(none)>2008-02-08 18:51:07 +0300
commit65c7d3004e6be96d5be3f39f9022c4c0cbb21bd7 (patch)
treeea69136014b51482d349000e132436b24096c65c /sql
parent047d7d0791e459b5651dbff9a6cf526d076ecc5b (diff)
parent7d98c21cdf4235ebe0d4abc52ae71fa4502e1524 (diff)
downloadmariadb-git-65c7d3004e6be96d5be3f39f9022c4c0cbb21bd7.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into dipika.(none):/opt/local/work/mysql-5.0-runtime
Diffstat (limited to 'sql')
-rw-r--r--sql/item.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 713e7709bcb..ffb18054750 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2580,6 +2580,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
if (entry && entry->value)
{
item_result_type= entry->type;
+ unsigned_flag= entry->unsigned_flag;
if (strict_type && required_result_type != item_result_type)
DBUG_RETURN(1);
switch (item_result_type) {
@@ -2875,7 +2876,10 @@ const String *Item_param::query_val_str(String* str) const
{
switch (state) {
case INT_VALUE:
- str->set(value.integer, &my_charset_bin);
+ if (unsigned_flag)
+ str->set((ulonglong) value.integer, &my_charset_bin);
+ else
+ str->set(value.integer, &my_charset_bin);
break;
case REAL_VALUE:
str->set(value.real, NOT_FIXED_DEC, &my_charset_bin);