diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-18 09:08:19 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-07-18 09:08:19 +0200 |
| commit | cdb8bb981c09225d3c8de154ba7b19e47e0e85c3 (patch) | |
| tree | 6111362461fd34c87a18ebf2a6d81db83fe98fff | |
| parent | 93915d0d50c8024f2a9fce766893df285fdf1eb7 (diff) | |
| parent | 1b18b486de7ff446d31fb98c9a5908350edc5120 (diff) | |
| download | mariadb-git-cdb8bb981c09225d3c8de154ba7b19e47e0e85c3.tar.gz | |
automerge 5.0->security => 5.1-security
| -rw-r--r-- | mysql-test/r/type_float.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/type_float.test | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index f88f33b6419..95ac2a23943 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -410,13 +410,10 @@ DROP TABLE t1; # # Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL # +# Ignoring output from misc. float operations select format(-1.7976931348623157E+307,256) as foo; -foo -ignore_float_result select least(-1.1111111111111111111111111, - group_concat(1.7976931348623157E+308)) as foo; -foo -ignore_float_result select concat((truncate((-1.7976931348623157E+307),(0x1e))), (99999999999999999999999999999999999999999999999999999999999999999)) into @a; End of 5.0 tests diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test index 95d6b6d802b..cb929702c0e 100644 --- a/mysql-test/t/type_float.test +++ b/mysql-test/t/type_float.test @@ -280,15 +280,17 @@ DROP TABLE t1; --echo # Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL --echo # +--echo # Ignoring output from misc. float operations +--disable_result_log + let $nine_65= 99999999999999999999999999999999999999999999999999999999999999999; ---replace_column 1 ignore_float_result select format(-1.7976931348623157E+307,256) as foo; ---replace_column 1 ignore_float_result select least(-1.1111111111111111111111111, - group_concat(1.7976931348623157E+308)) as foo; eval select concat((truncate((-1.7976931348623157E+307),(0x1e))), ($nine_65)) into @a; +--enable_result_log --echo End of 5.0 tests |