From: Tor Didriksen
Date: November 8 2010 11:34am
Subject: bzr commit into mysql-next-mr branch (tor.didriksen:3369) WL#1326
List-Archive: http://lists.mysql.com/commits/123067
Message-Id: <20101108113421.3ECBB372E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8628353936437966604=="

--===============8628353936437966604==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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


--===============8628353936437966604==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   qm5yu0rghuqnfydj
# target_branch: file:///export/home/didrik/repo/next-mr-bugfixing/
# testament_sha1: 74d1d2c0750d7e188b225951ebb181f6840fc75d
# timestamp: 2010-11-08 12:34:20 +0100
# source_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# base_revision_id: dao-gang.qu@stripped\
#   pijpcekmm5oum3fu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWejkwS4AAaHfgEgQWff//1ak
TIC///96UAQdbxrR0HQA1hoqn6NTyIm9JtRpoAPUAAAAACCU8oaep6ZNT1GmQ00A0AAAAA5piYCN
MCMIwAAABMIwGiaKeKjDymhPQNBoJ6QyGjCDABJITICMJppoTTIGUnkj0nqaAzJqeoTSDEJuwPfY
+xellkP/VwaGIyBAW3MS62/gW6JAKITiPp3W6XbTMzJPINemGHMfH8i9El55U2cyCGR72j2ritI6
zNpIc7BRMM3I84GOdDDVlgiExCG54FrMFaYwGu3MdckIgFg+oj19qW5Kzt5rrqxY9u1RFx4m186N
DKhKpL2WG6MaZVRS6mc5NShOEobE1fOME9dIqCZKYObl7Q9HEJTaz3F6aCtk7vkpMIkUvQPvNfe8
RSk+Dy20U74lmrWgFwGIrEKRcJ+SQmxmGu0IZYtqZUI4jEtCVCRAJ92yYVNqFDDi60Jd2w211YV2
PCi7S57tUHxYU5TdAgomRnWpl8ZHPvpFqgGNCQSLSoBT0tCeHo4WW+0vBJKQxOy0nKChfsVnB5O/
NBRXqsDCdwOrTXko1MYmco777ldYfSLwnMizjC0NypqeOUaCOmuOgTOcK9Qvni99D6abRlYqq6cF
FX4jqdRbZZ4NHSao3QcqDWybDTZJ1JoYEBoZIppqDCEWuN1E+mYSoKIVTkHmebFtuZCe0lyVFjDM
3+aHt9vw49eZWv9kV1uB3PycdEUvDq6bj4ny8WZKrj2TEA2KxHlba9E3NdS6WIwxJ3uh8u7wL73j
uteHaRjWt7am5IwCXNxuOh8ka0bUfMNBsHY0F7ZJ+5F252toNknJUJGMSOFuq2+okppk7fBULYV1
paT9BRQfPSmY4acNOWbkGcn5RLncd8qDXE49dUDi6wkC5/0omUSUM1asgMSbTyNbXSWlUB8ja6pC
ZFToDARk6qp+OOgXCBtZqEV3BQppWmnLvM8h8Oo0Gn17t7Wl9dx2fbzskT8EzpCOi8/NpnZ4i0df
YQFjMq89zbwqPgKhawir6vBDNfK9l78knzuNynAvvRMaztDRR9/24YTagox7wbusJsbxV8l4T+LM
qGyB6zUQPqnBUFXY8bgiN7E6TKSNs2GdNiQ5aFYLYofg27lTduuLSrKpVddEimmn3qHk8kaU4ek1
kIEwQ18iqBcKSdVysorFMyZWyTXWKXjODvnmCoDyZ4UTDfGDuSWKTA4Nzl8VnkqOBcypyZg4qB6K
fPNdmjKXxS75WKcURS9FUtzTslvW9yQzapkSr7sCfzE3LmBSrv326I12UT/VlQ+czxHi4+AF5k1k
AadWuR+PX6YlHpTWrWmejtTRkjCYlopb1vWGA2R8B6ptN89MUaxXBp8VAKwD3KKF3AXb3plt6Lrq
Z1yenO8k/xE6KzsTBYaHAbHTMUhSX8YKNYXpq/R+F3JFOFCQ6OTBLg==


--===============8628353936437966604==--