database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity

Fix for bug #10966: Variance functions return wrong data type.

Browse Source
This commit is contained in:
ramil@mysql.com
2005-11-22 18:29:46 +04:00
parent 84bc725fb9
commit ca345dede4
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/func_group.result
View File

@@ -1089,3 +1089,17 @@ SUM(a)
6 6
DROP TABLE t1; DROP TABLE t1;
set div_precision_increment= @sav_dpi; set div_precision_increment= @sav_dpi;
create table t1 select variance(0);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`variance(0)` double(8,4) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 select stddev(0);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`stddev(0)` double(8,4) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;

11
mysql-test/t/func_group.test
View File

@@ -703,3 +703,14 @@ SELECT SUM(a) FROM t1 GROUP BY b/c;
DROP TABLE t1; DROP TABLE t1;
set div_precision_increment= @sav_dpi; set div_precision_increment= @sav_dpi;
#
# Bug #10966: Variance functions return wrong data type
#
create table t1 select variance(0);
show create table t1;
drop table t1;
create table t1 select stddev(0);
show create table t1;
drop table t1;

3
sql/item_sum.cc
View File

@@ -1030,9 +1030,6 @@ Field *Item_sum_variance::create_tmp_field(bool group, TABLE *table,
sizeof(double)*2) + sizeof(longlong), sizeof(double)*2) + sizeof(longlong),
0, name, table, &my_charset_bin); 0, name, table, &my_charset_bin);
} }
if (hybrid_type == DECIMAL_RESULT)
return new Field_new_decimal(max_length, maybe_null, name, table,
decimals, unsigned_flag);
return new Field_double(max_length, maybe_null,name,table,decimals); return new Field_double(max_length, maybe_null,name,table,decimals);
} }

2
sql/item_sum.h
View File

@@ -481,7 +481,7 @@ public:
{ return sample ? "var_samp(" : "variance("; } { return sample ? "var_samp(" : "variance("; }
Item *copy_or_same(THD* thd); Item *copy_or_same(THD* thd);
Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length); Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length);
enum Item_result result_type () const { return hybrid_type; } enum Item_result result_type () const { return REAL_RESULT; }
}; };
class Item_sum_std; class Item_sum_std;