Test expansion: "MOD" on non-integral first operand.

mysql-test/r/ps_10nestset.result

@@ -62,4 +62,15 @@ id	emp	salary	l	r
 4	Donna	1064.80	5	6
 5	Eddie	931.70	7	8
 6	Fred	798.60	9	10
+prepare st_round from 'update t1 set salary = salary + ? - ( salary MOD ? )';
+set @arg_round= 50;
+execute st_round using @arg_round, @arg_round;
+select * from t1;
+id	emp	salary	l	r
+1	Jerry	1350.00	1	12
+2	Bert	1200.00	2	3
+3	Chuck	1250.00	4	11
+4	Donna	1100.00	5	6
+5	Eddie	950.00	7	8
+6	Fred	800.00	9	10
 drop table t1;

mysql-test/t/ps_10nestset.test

@@ -61,12 +61,11 @@ while ($1)
 
 select * from t1;
 
-# Waiting for the resolution of bug#6138
-# # Now, increase salary to a multiple of 50
-# prepare st_round from 'update t1 set salary = salary + ? - ( salary MOD ? )';
-# set @arg_round= 50;
-# execute st_round using @arg_round, @arg_round;
-# 
-# select * from t1;
+# Now, increase salary to a multiple of 50 (checks for bug#6138)
+prepare st_round from 'update t1 set salary = salary + ? - ( salary MOD ? )';
+set @arg_round= 50;
+execute st_round using @arg_round, @arg_round;
+
+select * from t1;
 
 drop table t1;