bk commit into 5.1 tree (mats:1.2413) BUG#26286

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-23 18:16:43+01:00, mats@romeo.(none) +1 -0
  BUG#26286 (row-based logging scales worse than statement-based logging):
  Submitting patch on Guilhem's behalf (he found the solution).
  
  Correcting a typo that caused very big increases in memory usage when
  more memory needed to be allocated for row-based events.

  sql/log_event.cc@stripped, 2007-02-23 18:16:35+01:00, mats@romeo.(none) +1 -1
    Correcting typo causing very big increases in memory usage.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b26286-mysql-5.1-rpl

--- 1.263/sql/log_event.cc	2007-02-23 18:16:52 +01:00
+++ 1.264/sql/log_event.cc	2007-02-23 18:16:52 +01:00
@@ -5521,7 +5521,7 @@
     my_ptrdiff_t const old_alloc= m_rows_end - m_rows_buf;
     my_ptrdiff_t const cur_size= m_rows_cur - m_rows_buf;
     my_ptrdiff_t const new_alloc= 
-        block_size * ((cur_size + length) / block_size + block_size - 1);
+        block_size * ((cur_size + length) / block_size) + block_size - 1;
 
     byte* const new_buf= (byte*)my_realloc((gptr)m_rows_buf, new_alloc,
                                            MYF(MY_ALLOW_ZERO_PTR|MY_WME));