diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-01 16:51:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-01 16:51:12 +0200 |
| commit | 4b4de01fae3b2c8ff27e733da3e2e03e90fbbaed (patch) | |
| tree | d3e974744cad9f159b17fe544b95ea910971057d /storage | |
| parent | d8a9bb4585fae93240ca0f58f64294b85bab5892 (diff) | |
| parent | 681fbcaf9255e1aa9f4ef458f8ef69f1a31eade2 (diff) | |
| download | mariadb-git-4b4de01fae3b2c8ff27e733da3e2e03e90fbbaed.tar.gz | |
5.3 merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/r/type_decimal.result | 4 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result index f54e1e5d5d5..5d271bc73fa 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result @@ -799,10 +799,10 @@ ROUND(qty,3) dps ROUND(qty,dps) DROP TABLE t1; SELECT 1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789 AS '%'; % -0.012345687012345687012345687012345687012345687012345687012345687012345687000000000 +0.012345687012345687012345687012 SELECT MOD(1, .123456789123456789123456789123456789123456789123456789123456789123456789123456789) AS 'MOD()'; MOD() -0.012345687012345687012345687012345687012345687012345687012345687012345687000000000 +0.012345687012345687012345687012 create table t1 (f1 decimal(6,6),f2 decimal(6,6) zerofill); insert into t1 values (-0.123456,0.123456); select group_concat(f1),group_concat(f2) from t1; diff --git a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result index 5bc38edd67a..ab199d21bcc 100644 --- a/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result +++ b/storage/tokudb/mysql-test/tokudb/r/type_newdecimal.result @@ -704,7 +704,7 @@ select .7777777777777777777777777777777777777 * 777777777777777777.777777777777777777700000000000 select .7777777777777777777777777777777777777 - 0.1; .7777777777777777777777777777777777777 - 0.1 -0.6777777777777777777777777777777777777 +0.677777777777777777777777777778 select .343434343434343434 + .343434343434343434; .343434343434343434 + .343434343434343434 0.686868686868686868 @@ -1841,7 +1841,7 @@ Warnings: Note 1265 Data truncated for column 'c1' at row 4 DESC t2; Field Type Null Key Default Extra -c1 decimal(32,30) YES NULL +c1 decimal(33,30) YES NULL DROP TABLE t1,t2; CREATE TABLE t1 (a DECIMAL(30,30)); INSERT INTO t1 VALUES (0.1),(0.2),(0.3); @@ -1852,7 +1852,7 @@ Note 1265 Data truncated for column 'c1' at row 2 Note 1265 Data truncated for column 'c1' at row 3 DESC t2; Field Type Null Key Default Extra -c1 decimal(34,0) YES NULL +c1 decimal(33,30) YES NULL DROP TABLE t1,t2; CREATE TABLE t1 (a DECIMAL(30,30)); INSERT INTO t1 VALUES (0.1),(0.2),(0.3); |