bk commit into 4.1 tree (jimw:1.2449) BUG#13975

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2449 05/11/23 17:07:43 jimw@stripped +3 -0
  Fix results of CONV() to behave like a bare string when being converted
  to a real value. (Bug #13975)

  sql/item_strfunc.h
    1.97 05/11/23 17:07:41 jimw@stripped +1 -1
    Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().

  mysql-test/t/func_str.test
    1.81 05/11/23 17:07:41 jimw@stripped +6 -0
    Add new test

  mysql-test/r/func_str.result
    1.99 05/11/23 17:07:40 jimw@stripped +6 -0
    Add new results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-13975

--- 1.96/sql/item_strfunc.h	2005-06-29 02:37:26 -07:00
+++ 1.97/sql/item_strfunc.h	2005-11-23 17:07:41 -08:00
@@ -499,7 +499,7 @@
   void fix_length_and_dec()
   {
     collation.set(default_charset());
-    decimals=0; max_length=64;
+    max_length= 64;
   }
 };
 

--- 1.98/mysql-test/r/func_str.result	2005-08-10 23:51:49 -07:00
+++ 1.99/mysql-test/r/func_str.result	2005-11-23 17:07:40 -08:00
@@ -1000,3 +1000,9 @@
 1000000
 1      
 drop table t1;
+select conv("18383815659218730760",10,10) + 0;
+conv("18383815659218730760",10,10) + 0
+1.8383815659219e+19
+select "18383815659218730760" + 0;
+"18383815659218730760" + 0
+1.8383815659219e+19

--- 1.80/mysql-test/t/func_str.test	2005-08-10 23:51:49 -07:00
+++ 1.81/mysql-test/t/func_str.test	2005-11-23 17:07:41 -08:00
@@ -662,4 +662,10 @@
 --disable_metadata
 drop table t1;
 
+#
+# Bug #13975: "same string" + 0 has 2 different results
+#
+select conv("18383815659218730760",10,10) + 0;
+select "18383815659218730760" + 0;
+
 # End of 4.1 tests