bk commit into 4.1 tree (ramil:1.2468) BUG#17974

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram 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.2468 06/03/14 12:46:42 ramil@stripped +2 -0
  bug #17974: INSERT ... SELECT with GROUP BY causes truncation of DECIMAL
  - looks like we cannot properly fix the issue in 4.1:
  either we have roundings or we have warnings,
  so it's not a real fix for the bug but only an attempt to show the problem.

  sql/field_conv.cc
    1.39 06/03/14 12:46:37 ramil@stripped +2 -1
    bug #17974: INSERT ... SELECT with GROUP BY causes truncation of DECIMAL
    - looks like we cannot properly fix the issue in 4.1:
    either we have roundings or we have warnings,
    so it's not a real fix for the bug but only an attempt to show the problem.

  mysql-test/r/type_decimal.result
    1.27 06/03/14 12:46:37 ramil@stripped +0 -2
    bug #17974: INSERT ... SELECT with GROUP BY causes truncation of DECIMAL
    - looks like we cannot properly fix the issue in 4.1:
    either we have roundings or we have warnings,
    so it's not a real fix for the bug but only an attempt to show the problem.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-4.1

--- 1.38/sql/field_conv.cc	2005-09-21 14:32:12 +05:00
+++ 1.39/sql/field_conv.cc	2006-03-14 12:46:37 +04:00
@@ -623,7 +623,8 @@ void field_conv(Field *to,Field *from)
        (to->result_type() == STRING_RESULT ||
 	(from->real_type() != FIELD_TYPE_ENUM &&
 	 from->real_type() != FIELD_TYPE_SET))) ||
-      to->type() == FIELD_TYPE_DECIMAL)
+      (from->result_type() == STRING_RESULT && 
+       to->type() == FIELD_TYPE_DECIMAL))
   {
     char buff[MAX_FIELD_WIDTH];
     String result(buff,sizeof(buff),from->charset());

--- 1.26/mysql-test/r/type_decimal.result	2005-09-27 15:10:42 +05:00
+++ 1.27/mysql-test/r/type_decimal.result	2006-03-14 12:46:37 +04:00
@@ -649,8 +649,6 @@ drop table t1;
 create table t1(a decimal(10,5), b decimal(10,1));
 insert into t1 values(123.12345, 123.12345);
 update t1 set b=a;
-Warnings:
-Warning	1265	Data truncated for column 'b' at row 1
 select * from t1;
 a	b
 123.12345	123.1