diff options
| author | unknown <hf@deer.(none)> | 2005-11-01 16:14:26 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-11-01 16:14:26 +0400 |
| commit | f9dbcd558a52652692c4593c93656431e4cbf043 (patch) | |
| tree | 72fa10e7ca020598101a3a72681588c392407cab /mysql-test | |
| parent | cc6db6d8886d4897408b032e7d3a2e6836a2311a (diff) | |
| download | mariadb-git-f9dbcd558a52652692c4593c93656431e4cbf043.tar.gz | |
Additional fix for bug #14445 (analyse.test fails)
mysql-test/r/analyse.result:
test result fixed
mysql-test/t/disabled.def:
user_var disabled
sql/sql_analyse.cc:
rounding added
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/analyse.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index 0aaf59e9c9d..f4e547dbc66 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -107,7 +107,7 @@ insert into t1 values(1.1); insert into t1 values(2.2); select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype -test.t1.df 1.1 2.2 8 8 0 0 1.650000000 0.55000 ENUM('1.1','2.2') NOT NULL +test.t1.df 1.1 2.2 13 13 0 0 1.65000 0.55000 ENUM('1.1','2.2') NOT NULL drop table t1; create table t1 (d double); insert into t1 values (100000); @@ -138,6 +138,6 @@ insert into t2 values (1, 'USA'),(2,'India'), (3,'Finland'); select product, sum(profit),avg(profit) from t1 group by product with rollup procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype test.t1.product Computer TV 2 8 0 0 4.2500 NULL ENUM('Computer','Phone','TV') NOT NULL -sum(profit) 10 6900 11 11 0 0 1946 2867.6719 ENUM('10','275','600','6900') NOT NULL -avg(profit) 10.000000000 1380.000000000 21 21 0 0 394.687500000 570.20033144 ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL +sum(profit) 10 6900 11 11 0 0 1946.2500 2867.6719 ENUM('10','275','600','6900') NOT NULL +avg(profit) 10.0000 1380.0000 16 16 0 0 394.68750000 570.20033144 ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL drop table t1,t2; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index eedf4b30e73..8e3dfa55847 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -16,3 +16,4 @@ rpl_until : Unstable test case, bug#12429 rpl_deadlock : Unstable test case, bug#12429 kill : Unstable test case, bug#9712 archive_gis : The test fails on 32bit Linux +user_var : Ramil should fix this soon |