From: Tor Didriksen
Date: November 8 2010 11:34am
Subject: bzr push into mysql-next-mr branch (tor.didriksen:3368 to 3369) WL#1326
List-Archive: http://lists.mysql.com/commits/123068
Message-Id: <20101108113430.17847372E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3369 Tor Didriksen	2010-11-08
      WL#1326 Precise GIS functions
        Post-merge fix broken build.
     @ sql/gcalc_slicescan.cc
        suggest a space before ';' or explicit braces around empty body in 'for' statement

    modified:
      sql/gcalc_slicescan.cc
 3368 Dao-Gang.Qu@stripped	2010-11-08
      Bug #55790  	Read_Master_Log_Pos is wrong after Slave_IO_Error= ER_NET_PACKET_TOO_LARGE
      
      Post fix.
     @ client/mysqlbinlog.cc
        Added code to set have_unflushed_events flag for Rows event.
     @ mysql-test/suite/rpl/r/rpl_packet.result
        Updated for bug#55790
     @ mysql-test/suite/rpl/t/rpl_packet.test
        Updated test case for bug#55790.
     @ sql/log_event.h
        Added a flag to indicate if the body cache have unflushed events.

    modified:
      client/mysqlbinlog.cc
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/t/rpl_packet.test
      sql/log_event.cc
      sql/log_event.h
=== modified file 'sql/gcalc_slicescan.cc'
--- a/sql/gcalc_slicescan.cc	2010-11-01 09:57:32 +0000
+++ b/sql/gcalc_slicescan.cc	2010-11-08 11:34:12 +0000
@@ -172,7 +172,8 @@ void Gcalc_heap::reset()
   if (!m_hook)
   {
     m_hook= &m_first;
-    for (; *m_hook; m_hook= &(*m_hook)->next);
+    for (; *m_hook; m_hook= &(*m_hook)->next)
+    {}
   }
 
   *m_hook= m_free;
@@ -354,7 +355,8 @@ int Gcalc_scan_iterator::insert_top_poin
      but structures used aren't suitable, and the
      scan is usually not really long */
   for (; sp && slice_first(sp, sp0);
-       prev_hook= &sp->next, sp=sp->get_next());
+       prev_hook= &sp->next, sp=sp->get_next())
+  {}
 
   if (m_cur_pi->right)
   {

No bundle (reason: useless for push emails).