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

 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
 3362 Alexey Botchkov	2010-11-04 [merge]
      merging.

    added:
      mysql-test/r/gis-precise.result
      mysql-test/r/gis-rt-precise.result
      mysql-test/t/gis-precise.test
      mysql-test/t/gis-rt-precise.test
      sql/gcalc_slicescan.cc
      sql/gcalc_slicescan.h
      sql/gcalc_tools.cc
      sql/gcalc_tools.h
      sql/plistsort.c
    modified:
      .bzr-mysql/default.conf
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      mysql-test/r/archive_gis.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/gis.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/t/gis.test
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/item_create.cc
      sql/item_geofunc.cc
      sql/item_geofunc.h
      sql/spatial.cc
      sql/spatial.h
      sql/sql_yacc.yy
=== 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)
 {

No bundle (reason: useless for push emails).