List:Internals« Previous MessageNext Message »
From:Joerg Bruehe Date:November 4 2005 11:38am
Subject:bk commit into 5.1 tree (joerg:1.1960)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1960 05/11/04 12:38:06 joerg@stripped +1 -0
  Compile fix for HP-UX + AIX.

  sql/spatial.h
    1.16 05/11/04 12:38:01 joerg@stripped +1 -1
    "The declaration of a class member within the class definition must not be qualified."
    (quoting the AIX compiler warning, error on HP-UX)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/clone-5.1

--- 1.15/sql/spatial.h	2005-11-01 22:52:42 +01:00
+++ 1.16/sql/spatial.h	2005-11-04 12:38:01 +01:00
@@ -245,7 +245,7 @@
   static Geometry *create_from_wkt(Geometry_buffer *buffer,
 				   Gis_read_stream *trs, String *wkt,
 				   bool init_stream=1);
-  static int Geometry::create_from_wkb(Geometry_buffer *buffer,
+  static int create_from_wkb(Geometry_buffer *buffer,
                                        const char *wkb, uint32 len, String *res);
   int as_wkt(String *wkt, const char **end)
   {
Thread
bk commit into 5.1 tree (joerg:1.1960)Joerg Bruehe4 Nov