List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:November 8 2010 11:34am
Subject:bzr commit into mysql-next-mr branch (tor.didriksen:3369) WL#1326
View as plain text  
#At file:///export/home/didrik/repo/next-mr-bugfixing/ based on revid:dao-gang.qu@stripped

 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
=== 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)
   {


Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20101108113412-qm5yu0rghuqnfydj.bundle
Thread
bzr commit into mysql-next-mr branch (tor.didriksen:3369) WL#1326Tor Didriksen8 Nov