From 11a2fd422b5e605f16335431254ee550b9f03363 Mon Sep 17 00:00:00 2001
From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <>
Date: Fri, 18 May 2007 18:16:51 +0500
Subject: [PATCH] Fox for bug #28509: strange behaviour: passing a decimal
 value to PS

Set parameter's type to Item::DECIMAL_ITEM assigning a decimal value.
---
 mysql-test/r/ps.result | 9 +++++++++
 mysql-test/t/ps.test   | 8 ++++++++
 sql/item.cc            | 6 ++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 20bff6bda1c..0048c4ad6c5 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1661,4 +1661,13 @@ execute stmt;
 ERROR 42S22: Unknown column 'y.value' in 'field list'
 deallocate prepare stmt;
 drop tables t1;
+prepare stmt from "create table t1 select ?";
+set @a=1.0;
+execute stmt using @a;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `?` decimal(2,1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 End of 5.0 tests.
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 3fbcf84a1f9..08949bd8cff 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -1773,5 +1773,13 @@ execute stmt;
 deallocate prepare stmt;
 drop tables t1;
 
+#
+# Bug #28509: strange behaviour: passing a decimal value to PS
+#
+prepare stmt from "create table t1 select ?";
+set @a=1.0;
+execute stmt using @a;
+show create table t1;
+drop table t1;
 
 --echo End of 5.0 tests.
diff --git a/sql/item.cc b/sql/item.cc
index 827c872adbc..cccbbdeb043 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2506,16 +2506,14 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
   if (entry && entry->value)
   {
     item_result_type= entry->type;
-    switch (entry->type) {
+    switch (item_result_type) {
     case REAL_RESULT:
       set_double(*(double*)entry->value);
       item_type= Item::REAL_ITEM;
-      item_result_type= REAL_RESULT;
       break;
     case INT_RESULT:
       set_int(*(longlong*)entry->value, MY_INT64_NUM_DECIMAL_DIGITS);
       item_type= Item::INT_ITEM;
-      item_result_type= INT_RESULT;
       break;
     case STRING_RESULT:
     {
@@ -2537,7 +2535,6 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
         charset of connection, so we have to set it later.
       */
       item_type= Item::STRING_ITEM;
-      item_result_type= STRING_RESULT;
 
       if (set_str((const char *)entry->value, entry->length))
         DBUG_RETURN(1);
@@ -2551,6 +2548,7 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
       decimals= ent_value->frac;
       max_length= my_decimal_precision_to_length(ent_value->precision(),
                                                  decimals, unsigned_flag);
+      item_type= Item::DECIMAL_ITEM;
       break;
     }
     default: