summaryrefslogtreecommitdiff
path: root/mysql-test/r/analyse.result
diff options
context:
space:
mode:
authorunknown <iggy@rolltop.ignatz42.dyndns.org>2006-09-28 14:32:30 -0400
committerunknown <iggy@rolltop.ignatz42.dyndns.org>2006-09-28 14:32:30 -0400
commite99cf7edb9649fe847e8f1b7ac694febda844968 (patch)
treeadefb048b1160cf1a8a8e448cb8291f9ab9d8330 /mysql-test/r/analyse.result
parent131d94f58c07629ec37c0af32c6657dea8bc5e4e (diff)
parent314e10592ceac7def3ea4863d5a1f8b23464bf30 (diff)
downloadmariadb-git-e99cf7edb9649fe847e8f1b7ac694febda844968.tar.gz
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 mysql-test/r/analyse.result: Auto merged sql/sql_analyse.cc: Auto merged mysql-test/t/analyse.test: manual merge
Diffstat (limited to 'mysql-test/r/analyse.result')
-rw-r--r--mysql-test/r/analyse.result13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result
index 56f67cce4d6..0ecc462fb70 100644
--- a/mysql-test/r/analyse.result
+++ b/mysql-test/r/analyse.result
@@ -141,3 +141,16 @@ test.t1.product Computer TV 2 8 0 0 4.2500 NULL ENUM('Computer','Phone','TV') NO
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;
+create table t1 (f1 double(10,5), f2 char(10), f3 double(10,5));
+insert into t1 values (5.999, "5.9999", 5.99999), (9.555, "9.5555", 9.55555);
+select f1 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.f1 5.99900 9.55500 7 7 0 0 7.77700 1.77800 FLOAT(4,3) NOT NULL
+select f2 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.f2 5.9999 9.5555 6 6 0 0 6.0000 NULL FLOAT(5,4) UNSIGNED NOT NULL
+select f3 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.f3 5.99999 9.55555 7 7 0 0 7.77777 1.77778 FLOAT(6,5) NOT NULL
+drop table t1;
+End of 4.1 tests