diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-11 22:10:04 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-11 22:10:04 +0300 |
| commit | 49be919a89e0cc26f346ae9e5575c15061eabb14 (patch) | |
| tree | fd3ff778e59ec0ce8ff8e4c8189219f7e42e52b5 | |
| parent | 8de4865a1ca44858eb0ac71f7431cb6c1e87ef4c (diff) | |
| download | mariadb-git-49be919a89e0cc26f346ae9e5575c15061eabb14.tar.gz | |
Merged from 4.1
| -rw-r--r-- | mysql-test/r/analyse.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/analyse.test | 15 |
2 files changed, 14 insertions, 7 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index a56902e8ae7..df524b491f1 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -109,3 +109,9 @@ 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.302500000 ENUM('1.1','2.2') NOT NULL drop table t1; +create table t1 (d double); +insert into t1 values (100000); +select * from t1 procedure analyse (1,1); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype +test.t1.d 100000 100000 6 6 0 0 100000 0 MEDIUMINT(6) UNSIGNED NOT NULL +drop table t1; diff --git a/mysql-test/t/analyse.test b/mysql-test/t/analyse.test index 101101fdda4..4060892c389 100644 --- a/mysql-test/t/analyse.test +++ b/mysql-test/t/analyse.test @@ -48,6 +48,14 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),( select * from t1 procedure analyse(); drop table t1; +#decimal-related test + +create table t1 (df decimal(5,1)); +insert into t1 values(1.1); +insert into t1 values(2.2); +select * from t1 procedure analyse(); +drop table t1; + # # Bug#10716 - Procedure Analyse results in wrong values for optimal field type # @@ -59,10 +67,3 @@ drop table t1; # End of 4.1 tests -#decimal-related test - -create table t1 (df decimal(5,1)); -insert into t1 values(1.1); -insert into t1 values(2.2); -select * from t1 procedure analyse(); -drop table t1; |