automerge 5.0->security => 5.1-security

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

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