bzr push into mysql-trunk branch (sujatha.sivakumar:4112 to 4113)

[Sujatha Sivakumar]

 4113 Sujatha Sivakumar	2012-07-25 [merge]
      merge from 5.6 to mysql-trunk

    modified:
      mysys/mf_iocache.c
 4112 Annamalai Gurusami	2012-07-25 [merge]
      Null merge from mysql-5.6 to mysql-5.7

=== modified file 'mysys/mf_iocache.c'
--- a/mysys/mf_iocache.c	2012-07-24 11:09:26 +0000
+++ b/mysys/mf_iocache.c	2012-07-25 09:33:25 +0000
@@ -1539,7 +1539,7 @@ int _my_b_write(register IO_CACHE *info,
 
   DBUG_EXECUTE_IF("simulate_huge_load_data_file",
                   {
-                    pos_in_file=5000000000;
+                    pos_in_file=(my_off_t)(5000000000ULL);
                   });
   if (pos_in_file+info->buffer_length > info->end_of_file)
   {

No bundle (reason: useless for push emails).