after-merge fix

mysql-test/r/func_math.result

@@ -127,13 +127,3 @@ Warnings:
 Note	1003	select degrees(pi()) AS `degrees(pi())`,radians(360) AS `radians(360)`
 select rand(rand);
 ERROR 42S22: Unknown column 'rand' in 'field list'
-create table t1 select round(1, 6);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `round(1, 6)` double(7,6) NOT NULL default '0.000000'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-select * from t1;
-round(1, 6)
-1.000000
-drop table t1;

mysql-test/t/func_math.test

@@ -62,12 +62,3 @@ explain extended select degrees(pi()),radians(360);
 
 --error 1054
 select rand(rand);
-
-#
-# Bug #9837: problem with round()
-#
-
-create table t1 select round(1, 6);
-show create table t1;
-select * from t1;
-drop table t1;