Merge from 5.1 to 5.5

62db3380 · Nisha Gopalakrishnan · 9a1d651b · e85c90b9 · 62db3380
Commit 62db3380 authored Mar 28, 2013 by Nisha Gopalakrishnan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/item.cc sql/item.cc +3 -1

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3370,7 +3370,9 @@ bool Item_param::convert_str_value(THD *thd)
    /* Here str_value is guaranteed to be in final_character_set_of_str_value */
    max_length= str_value.numchars() * str_value.charset()->mbmaxlen;
-    decimals= 0;
+    /* For the strings converted to numeric form within some functions */
+    decimals= NOT_FIXED_DEC;
    /*
      str_value_ptr is returned from val_str(). It must be not alloced
      to prevent it's modification by val_str() invoker.