merge from 5.5 to 5.6

Author: Sujatha Sivakumar

mysys/mf_iocache.c

@@ -1535,8 +1535,13 @@ int _my_b_get(IO_CACHE *info)
 int _my_b_write(register IO_CACHE *info, const uchar *Buffer, size_t Count)
 {
   size_t rest_length,length;
+  my_off_t pos_in_file= info->pos_in_file;
 
-  if (info->pos_in_file+info->buffer_length > info->end_of_file)
+  DBUG_EXECUTE_IF("simulate_huge_load_data_file",
+                  {
+                    pos_in_file=5000000000;
+                  });
+  if (pos_in_file+info->buffer_length > info->end_of_file)
   {
     my_errno=errno=EFBIG;
     return info->error = -1;

sql/binlog.cc

@@ -223,7 +223,7 @@ class binlog_cache_data
 public:
 
   binlog_cache_data(bool trx_cache_arg,
-                    ulong max_binlog_cache_size_arg,
+                    my_off_t max_binlog_cache_size_arg,
                     ulong *ptr_binlog_cache_use_arg,
                     ulong *ptr_binlog_cache_disk_use_arg)
   : m_pending(0), saved_max_binlog_cache_size(max_binlog_cache_size_arg),
@@ -452,7 +452,7 @@ class binlog_cache_data
     is configured. This corresponds to either
       . max_binlog_cache_size or max_binlog_stmt_cache_size.
   */
-  ulong saved_max_binlog_cache_size;
+  my_off_t saved_max_binlog_cache_size;
 
   /*
     Stores a pointer to the status variable that keeps track of the in-memory 
@@ -478,7 +478,7 @@ class binlog_stmt_cache_data
 {
 public:
   binlog_stmt_cache_data(bool trx_cache_arg,
-                        ulong max_binlog_cache_size_arg,
+                        my_off_t max_binlog_cache_size_arg,
                         ulong *ptr_binlog_cache_use_arg,
                         ulong *ptr_binlog_cache_disk_use_arg)
     : binlog_cache_data(trx_cache_arg,
@@ -517,7 +517,7 @@ class binlog_trx_cache_data : public binlog_cache_data
 {
 public:
   binlog_trx_cache_data(bool trx_cache_arg,
-                        ulong max_binlog_cache_size_arg,
+                        my_off_t max_binlog_cache_size_arg,
                         ulong *ptr_binlog_cache_use_arg,
                         ulong *ptr_binlog_cache_disk_use_arg)
   : binlog_cache_data(trx_cache_arg,
@@ -605,10 +605,10 @@ class binlog_trx_cache_data : public binlog_cache_data
 
 class binlog_cache_mngr {
 public:
-  binlog_cache_mngr(ulong max_binlog_stmt_cache_size_arg,
+  binlog_cache_mngr(my_off_t max_binlog_stmt_cache_size_arg,
                     ulong *ptr_binlog_stmt_cache_use_arg,
                     ulong *ptr_binlog_stmt_cache_disk_use_arg,
-                    ulong max_binlog_cache_size_arg,
+                    my_off_t max_binlog_cache_size_arg,
                     ulong *ptr_binlog_cache_use_arg,
                     ulong *ptr_binlog_cache_disk_use_arg)
   : stmt_cache(FALSE, max_binlog_stmt_cache_size_arg,