diff options
| author | unknown <holyfoot@eagle.intranet.mysql.r18.ru> | 2006-01-21 21:50:54 +0400 |
|---|---|---|
| committer | unknown <holyfoot@eagle.intranet.mysql.r18.ru> | 2006-01-21 21:50:54 +0400 |
| commit | 49a09cc3397581d120d097f06b5b807925cfec8a (patch) | |
| tree | 3daacb06fabbe5067b041782858566db0be2fcf4 | |
| parent | 494bccf044edd91363bf4b296dbc0cbbdc4e4bf9 (diff) | |
| download | mariadb-git-49a09cc3397581d120d097f06b5b807925cfec8a.tar.gz | |
Merging
mysql-test/r/func_gconcat.result:
merging
mysql-test/r/type_float.result:
merging
| -rw-r--r-- | mysql-test/r/func_gconcat.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/type_float.result | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 057c4990309..2a36e6fe17b 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -131,9 +131,9 @@ grp group_concat(a separator "")+0 3 456789 select grp, group_concat(a separator "")+0.0 from t1 group by grp; grp group_concat(a separator "")+0.0 -1 1 -2 23 -3 456789 +1 1.0 +2 23.0 +3 456789.0 select grp, ROUND(group_concat(a separator "")) from t1 group by grp; grp ROUND(group_concat(a separator "")) 1 1 diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index 86c89231cc4..fb8d0515c18 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -245,22 +245,22 @@ show warnings; Level Code Message desc t1; Field Type Null Key Default Extra -x double 0 +x decimal(21,2) unsigned NO 0.00 drop table t1; create table t1 select 0.0 x; desc t1; Field Type Null Key Default Extra -x double(3,1) 0.0 +x decimal(2,1) unsigned NO 0.0 create table t2 select 105213674794682365.00 y; desc t2; Field Type Null Key Default Extra -y double(21,2) 0.00 +y decimal(20,2) unsigned NO 0.00 create table t3 select x+y a from t1,t2; show warnings; Level Code Message desc t3; Field Type Null Key Default Extra -a double 0 +a decimal(21,2) unsigned NO 0.00 drop table t1,t2,t3; create table t1 (s1 float(0,2)); ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1'). |