From: Tor Didriksen
Date: November 5 2010 9:34am
Subject: bzr commit into mysql-next-mr branch (tor.didriksen:3363) WL#1326
List-Archive: http://lists.mysql.com/commits/122914
Message-Id: <20101105093408.C2CF235BB@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8288017046431073840=="

--===============8288017046431073840==
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:holyfoot@stripped

 3363 Tor Didriksen	2010-11-05
      WL#1326 Precise GIS functions
      Post-merge fix broken build.
     @ sql/gcalc_slicescan.h
        error: suggest a space before ';' or explicit braces around empty body in 'while' statement
     @ sql/plistsort.c
        'typedef ignored'

    modified:
      sql/gcalc_slicescan.h
      sql/plistsort.c
=== modified file 'sql/gcalc_slicescan.h'
--- a/sql/gcalc_slicescan.h	2010-10-28 09:54:31 +0000
+++ b/sql/gcalc_slicescan.h	2010-11-05 09:34:03 +0000
@@ -391,7 +391,8 @@ public:
   const Gcalc_scan_iterator::point *rb() const
   {
     const Gcalc_scan_iterator::point *result= sp0;
-    while ((result= result->c_get_next())->is_bottom());
+    while ((result= result->c_get_next())->is_bottom())
+    {}
     return result;
   }
   const Gcalc_scan_iterator::point *rt() const

=== modified file 'sql/plistsort.c'
--- a/sql/plistsort.c	2010-06-30 11:04:45 +0000
+++ b/sql/plistsort.c	2010-11-05 09:34:03 +0000
@@ -33,7 +33,7 @@ typedef struct LS_STRUCT_NAME
   LS_LIST_ITEM *list1;
   int list_len;
   int return_point;
-};
+} LS_STRUCT_NAME;
 
 LS_SCOPE LS_LIST_ITEM* LS_NAME(LS_COMPARE_FUNC_DECL LS_LIST_ITEM *list, int list_len)
 {


--===============8288017046431073840==
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\
#   x8sulcptijp43d2p
# target_branch: file:///export/home/didrik/repo/next-mr-bugfixing/
# testament_sha1: 1277aa2fda33ed3039cc697f487204bef80ed403
# timestamp: 2010-11-05 10:34:08 +0100
# source_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# base_revision_id: holyfoot@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZh0QC8AAkFfgEAQWOP//36n
XoC////6UAUNN5m0pzUztVa1heElFNpNMpmmymj0JT9Amk81Q0AMmRiGQJJCGIE9CKemhqegj1Gj
QAAAaAYo1T0yp6nqPU9QNGhoNA9TQB6Q9Q9Q09IGeoCYJtRiYE00BpgBMjJkGQ0BJJMFNGTU8Jqa
Yp4mgmTEMQGhoAfDEaH2x/zTugd5qt1Q8ZVHLJd4wBWOKLpHt1ukoNAmldybCLBSEkkcFoFTQnZ4
cqENTA5kFN9T7jaVTaH6I/jJKvDH9e9ssDhM05sXdJzxBs11ln6tI7yDcoYmCPp1Oq2UsPK1uHHg
0bu4jBlSesiF5E+O3eunc6phPmV7yy0Bk7kfYjBEkF6C1GhyVMz7ayNaJMhmtzdxHpedobEgoCbI
JYpzAMCxIq4WVKNAt+gCE0ORNRwJyZ+/mxZf2OruL1ewOLcq4MkG1qgXIU8JAUuKSWQfYV9HX81l
krC+iK2uLRUj8hlgcrvbBU79s9bNriBn82bHNuZ1q2D0g00bIKEt82irVW7EjcraDhjAuKRjMCLu
V2TFkNLAIQw5RjW4e+xcLh6fibi6O6RUZgJElxmVQpr1KKzAPWhrlRdDgUzAhGo12DmOF1p2ebYo
jFy7iy5rbgOpHTL+FFgoyIldxpbZ3Jxauta5lZZNPYTxMlbnQ2qmIa6DunK4ngaje/Ks42qzOWbi
NpwWF1xM4iRk3LbBw/AbQw4M7rCYXHebIKgyFR9y3kGv2HeMmjhOZi7VZiMX06wHLOyqWoBranPp
NY6X7mkt1NhXkS10ruvDTJzoNUY0QdAiamBYpkAw03wTy58iIyUbceM4d4bYnCqSNYXJYMlaiRAg
XTySSCVGej5Z13474vk+/O3pb913qZvr0ZwwMHIc/ucEEV7XhFjm5z5dJ49TMglmXX1jk8igiykU
vIas5ZyasgmeHI9uWUe86wlUVvrdXOuEnzDSdxBeqWw1FhYTwPb596HI1ouUGMD38T9iNjVtQzIH
iVmUCPgmkd4/cY11lzAVcoxSD6ckwfgVosK8cUG9VJHtKum3Da42etyE2b4HWPTjng/Mo6hDgdRh
M62deFaN/gkUxZ+kb9rq4wbL4nv3Sjo2vodn0xnYg0vXUmBmjM6XdmgLW5RZONYjK8nQ6mq7001j
yBrN+4OUYhQPTixWn5L9gxar8hceSK4ERr07ly7GSti8Dow5j9BhgWYBfUXpuwWd141EysRMGNvU
hmxtMWR++CCiblyOAmI0dWgZknkDoRXk8vDdB2lGTnHmitDbcFnJh14EpKe6KJBH5QXBMibl+uCN
IErWRmQMKaPSKN0lTUkHS2tRKtNSuO1ZZkuglYpk59yLR5GxDJyBt4/EqRDZN6lxWUjSlBgZVdib
OR0tvRs0pKaL2miJ4XSQUXoGodxYrkXSKlebxZ58En5CK9AG0xYMFFSrXNRtOft7WyOurpH8gDtq
xLEEiuohFyDYnp17CTNg1aWfG/qepHR4xEVibDlvr1bsJyR2ucE3cJwWigKHYIouZryCGIhqchyN
xlYbERJhc1T0TQ70gQIYqPhWqlJ8/GqD9EceKdXHUiJhEJDVZ0CPfUD0DTt5AMzhPoNqYh5cUUCT
A5Gltv5xObfYzAcWGlYqJrjKU1AWrMsUeC19lmSia2+gB8wOO+5jx1IqL0sA+A0AlZgSAQCU/Qfx
dyRThQkJh0QC8A==


--===============8288017046431073840==--