bzr push into mysql-trunk branch (marko.makela:4252 to 4253)

[marko.makela]

 4253 Marko Mäkelä	2012-08-20 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      storage/innobase/row/row0merge.cc
 4252 Mattias Jonsson	2012-08-20 [merge]
      merge

    modified:
      sql/ha_partition.cc
      sql/ha_partition.h
=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:mattias.jonsson@strippedeiaq793pzb1
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@stripped
@@ -1606,11 +1606,13 @@ end_of_index:
 				}
 
 			case DATA_FLOAT:
-				mach_float_write(b, value);
+				mach_float_write(
+					b, static_cast<float>(value));
 				break;
 
 			case DATA_DOUBLE:
-				mach_double_write(b, value);
+				mach_double_write(
+					b, static_cast<double>(value));
 				break;
 
 			default:

No bundle (reason: useless for push emails).