Merge with 4.0.3

Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
  Auto merged
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
  Auto merged
Docs/manual.texi:
  Auto merged
SSL/cacert.pem:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_dump.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/ft_test1.c:
  Auto merged
myisam/ft_update.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_static.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_test2.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_error.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/convert.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-latin1_de.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
  merge with 4.0.3
BitKeeper/triggers/post-commit:
  merge with 4.0.3
client/mysql.cc:
  merge with 4.0.3 + simple optimsation
client/mysqltest.c:
  merge with 4.0.3 (Indentation change)
configure.in:
  merge with 4.0.3
extra/resolve_stack_dump.c:
  merge with 4.0.3 (Indentation change)
include/Makefile.am:
  merge with 4.0.3
include/myisam.h:
  merge with 4.0.3 (Indentation change)
include/mysql.h:
  merge with 4.0.3 (removed not used structure)
include/mysqld_error.h:
  merge with 4.0.3
libmysql/Makefile.shared:
  merge with 4.0.3
libmysql/libmysql.c:
  merge with 4.0.3 (Indentation change)
libmysqld/Makefile.am:
  merge with 4.0.3
myisam/ft_boolean_search.c:
  merge with 4.0.3 (Indentation change)
myisam/ft_nlq_search.c:
  merge with 4.0.3 (Indentation change)
myisam/mi_check.c:
  merge with 4.0.3
myisam/mi_search.c:
  merge with 4.0.3
myisam/mi_unique.c:
  merge with 4.0.3
mysys/Makefile.am:
  merge with 4.0.3
mysys/mf_casecnv.c:
  merge with 4.0.3
sql-bench/server-cfg.sh:
  Removed 8000 max row limit for Innodb
sql/Makefile.am:
  merge with 4.0.3
sql/field.cc:
  Indentation cleanup
  Changed sprintf -> my_sprintf
sql/field.h:
  merge with 4.0.3
sql/ha_heap.cc:
  merge with 4.0.3 (Indentation change)
sql/item.h:
  merge with 4.0.3 (Indentation change)
sql/item_cmpfunc.cc:
  merge with 4.0.3
sql/item_cmpfunc.h:
  Removed size_of() from items
  Indentation cleanup
sql/item_create.cc:
  merge
sql/item_create.h:
  merge
sql/item_func.cc:
  Added comments
  Changed string functions to use character set of first string argument as default return characterset
  Simple optimizations.
  Removed return of uninitalized variable.
sql/item_func.h:
  merge
sql/item_strfunc.cc:
  merge with 4.0.3 (Indentation change)
sql/item_strfunc.h:
  removed size_of()
sql/item_uniq.h:
  removed size_of()
sql/lex.h:
  merge with 4.0.3 (Indentation change)
sql/log_event.cc:
  Add ` around database in 'use database' in binary log.
sql/mysql_priv.h:
  merge with 4.0.3
sql/mysqld.cc:
  merge with 4.0.3 (Indentation change)
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/share/ukrainian/errmsg.txt:
  merge
sql/sql_acl.cc:
  merge with 4.0.3
sql/sql_base.cc:
  More comments
  Fixed bug in send_fields() when using convert
sql/sql_class.cc:
  merge
sql/sql_class.h:
  Merge with 4.0.3
  Moved max_error_count and max_warning_count to variables struct.
sql/sql_delete.cc:
  merge with 4.0.3 (Indentation change)
sql/sql_lex.h:
  merge with 4.0.3
sql/sql_parse.cc:
  Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT.
  (Should be retrived from variables)
sql/sql_select.cc:
  merge with 4.0.3
sql/sql_show.cc:
  merge with 4.0.3
sql/sql_union.cc:
  merge with 4.0.3
sql/sql_update.cc:
  merge with 4.0.3
sql/sql_yacc.yy:
  merge with 4.0.3
  Indentation cleanup
sql/structs.h:
  merge with 4.0.3
sql/table.cc:
  merge with 4.0.3
sql/table.h:
  merge with 4.0.3

1 files changed, 476 insertions, 0 deletions

diff --git a/sql/spatial.h b/sql/spatial.h
new file mode 100644
index 00000000000..c6e30a44fbf
--- /dev/null
+++ b/sql/spatial.h
@@ -0,0 +1,476 @@
+#ifndef _spatial_h
+#define _spatial_h
+
+#include "gstream.h"
+
+const uint POINT_DATA_SIZE = 8+8; 
+const uint WKB_HEADER_SIZE = 1+4;
+
+struct stPoint2D
+{
+  double x;
+  double y;
+};
+
+struct stLinearRing
+{
+  size_t n_points;
+  stPoint2D points;
+};
+
+/***************************** MBR *******************************/
+
+struct MBR
+{
+  MBR()
+  {
+    xmin=DBL_MAX;
+    ymin=DBL_MAX;
+    xmax=-DBL_MAX;
+    ymax=-DBL_MAX;
+  }
+
+  MBR(const double &_xmin, const double &_ymin, const double &_xmax, const double &_ymax)
+  {
+    xmin=_xmin;
+    ymin=_ymin;
+    xmax=_xmax;
+    ymax=_ymax;
+  }
+
+  MBR(const stPoint2D &min, const stPoint2D &max)
+  {
+    xmin=min.x;
+    ymin=min.y;
+    xmax=max.x;
+    ymax=max.y;
+  }
+  
+  double xmin;
+  double ymin;
+  double xmax;
+  double ymax;
+  
+  void add_xy(double x, double y)
+  { /* Not using "else" for proper one point MBR calculation */
+    if (x<xmin)
+    {
+      xmin=x;
+    }
+    if (x>xmax)
+    {
+      xmax=x;
+    }
+    if (y<ymin)
+    {
+      ymin=y;
+    }
+    if (y>ymax)
+    {
+      ymax=y;
+    }
+  }
+
+  void add_xy(const char *px, const char *py)
+  { /* Not using "else" for proper one point MBR calculation */
+    double x, y;
+    float8get(x, px);
+    float8get(y, py);
+    if (x<xmin)
+    {
+      xmin=x;
+    }
+    if (x>xmax)
+    {
+      xmax=x;
+    }
+    if (y<ymin)
+    {
+      ymin=y;
+    }
+    if (y>ymax)
+    {
+      ymax=y;
+    }
+  }
+
+  void add_mbr(const MBR *mbr)
+  {
+    if (mbr->xmin<xmin)
+    {
+      xmin=mbr->xmin;
+    }
+    if (mbr->xmax>xmax)
+    {
+      xmax=mbr->xmax;
+    }
+    if (mbr->ymin<ymin)
+    {
+      ymin=mbr->ymin;
+    }
+    if (mbr->ymax>ymax)
+    {
+      ymax=mbr->ymax;
+    }
+  }
+
+  int equals(const MBR *mbr)
+  {
+    return (mbr->xmin==xmin)&&(mbr->ymin==ymin)&&(mbr->xmax==xmax)&&(mbr->ymax==ymax);
+  }
+
+  int disjoint(const MBR *mbr)
+  {
+    return (mbr->xmin>xmax)||(mbr->ymin>ymax)||(mbr->xmax<xmin)||(mbr->ymax<ymin);
+  }
+
+  int intersects(const MBR *mbr)
+  {
+    return !disjoint(mbr);
+  }
+
+  int touches(const MBR *mbr)
+  {
+    return (((mbr->xmin==xmax) || (mbr->xmax==xmin)) && 
+            ((mbr->ymin>=ymin) && (mbr->ymin<=ymax) || 
+                (mbr->ymax>=ymin) && (mbr->ymax<=ymax))) ||
+           (((mbr->ymin==ymax) || (mbr->ymax==ymin)) &&
+            ((mbr->xmin>=xmin) && (mbr->xmin<=xmax) ||
+                  (mbr->xmax>=xmin)&&(mbr->xmax<=xmax)));
+  }
+
+  int within(const MBR *mbr)
+  {
+    return (mbr->xmin<=xmin) && (mbr->ymin<=ymin) &&
+              (mbr->xmax>=xmax) && (mbr->ymax>=ymax);
+  }
+
+  int contains(const MBR *mbr)
+  {
+    return (mbr->xmin>=xmin) && (mbr->ymin>=ymin) &&
+                (mbr->xmax<=xmax) && (mbr->ymax<=ymax);
+  }
+
+  bool inner_point(double x, double y) const
+  {
+    return (xmin<x) && (xmax>x) && (ymin<y) && (ymax>x);
+  }
+
+  int overlaps(const MBR *mbr)
+  {
+    int lb = mbr->inner_point(xmin, ymin);
+    int rb = mbr->inner_point(xmax, ymin);
+    int rt = mbr->inner_point(xmax, ymax);
+    int lt = mbr->inner_point(xmin, ymax);
+
+    int a  = lb+rb+rt+lt;
+    return (a>0) && (a<4) && (!within(mbr));
+  }
+};
+
+
+/***************************** Geometry *******************************/
+
+class Geometry;
+
+typedef int (Geometry::*GF_InitFromText)(GTextReadStream *, String *);
+typedef int (Geometry::*GF_GetDataAsText)(String *) const;
+typedef size_t (Geometry::*GF_GetDataSize)() const;
+typedef int (Geometry::*GF_GetMBR)(MBR *) const;
+
+typedef int (Geometry::*GF_GetD)(double *) const;
+typedef int (Geometry::*GF_GetI)(int *) const;
+typedef int (Geometry::*GF_GetUI)(uint32 *) const;
+typedef int (Geometry::*GF_GetWS)(String *) const;
+typedef int (Geometry::*GF_GetUIWS)(uint32, String *) const;
+
+#define GEOM_METHOD_PRESENT(geom_obj, method)\
+    (geom_obj.m_vmt->method != &Geometry::method)
+
+class Geometry
+{
+public:
+  enum wkbType
+  {
+    wkbPoint = 1,
+    wkbLineString = 2,
+    wkbPolygon = 3,
+    wkbMultiPoint = 4,
+    wkbMultiLineString = 5,
+    wkbMultiPolygon = 6,
+    wkbGeometryCollection = 7
+  };
+  enum wkbByteOrder
+  {
+    wkbXDR = 0,    /* Big Endian */
+    wkbNDR = 1     /* Little Endian */
+  };                                    
+
+
+  class GClassInfo
+  {
+  public:
+    GF_InitFromText init_from_text;
+    GF_GetDataAsText get_data_as_text;
+    GF_GetDataSize get_data_size;
+    GF_GetMBR get_mbr;
+    GF_GetD get_x;
+    GF_GetD get_y;
+    GF_GetD length;
+    GF_GetD area;
+
+    GF_GetI is_closed;
+
+    GF_GetUI num_interior_ring;
+    GF_GetUI num_points;
+    GF_GetUI num_geometries;
+    GF_GetUI dimension;
+
+    GF_GetWS start_point;
+    GF_GetWS end_point;
+    GF_GetWS exterior_ring;
+    GF_GetWS centroid;
+
+    GF_GetUIWS point_n;
+    GF_GetUIWS interior_ring_n;
+    GF_GetUIWS geometry_n;
+
+    int m_type_id;
+    const char *m_name;
+    GClassInfo *m_next_rt;
+  };
+  GClassInfo *m_vmt;
+
+  const GClassInfo *get_class_info() const { return m_vmt; }
+  size_t get_data_size() const { return (this->*m_vmt->get_data_size)(); }
+  
+  int init_from_text(GTextReadStream *trs, String *wkb) 
+      { return (this->*m_vmt->init_from_text)(trs, wkb); }
+
+  int get_data_as_text(String *txt) const
+    { return (this->*m_vmt->get_data_as_text)(txt); }
+
+  int get_mbr(MBR *mbr) const { return (this->*m_vmt->get_mbr)(mbr); }
+  int dimension(uint32 *dim) const
+     { return (this->*m_vmt->dimension)(dim); }
+
+  int get_x(double *x) const { return (this->*m_vmt->get_x)(x); }
+  int get_y(double *y) const { return (this->*m_vmt->get_y)(y); }
+  int length(double *len) const  { return (this->*m_vmt->length)(len); }
+  int area(double *ar) const  { return (this->*m_vmt->area)(ar); }
+
+  int is_closed(int *closed) const  { return (this->*m_vmt->is_closed)(closed); }
+
+  int num_interior_ring(uint32 *n_int_rings) const 
+          { return (this->*m_vmt->num_interior_ring)(n_int_rings); }
+  int num_points(uint32 *n_points) const
+          { return (this->*m_vmt->num_points)(n_points); }
+
+  int num_geometries(uint32 *num) const
+          { return (this->*m_vmt->num_geometries)(num); }
+
+  int start_point(String *point) const
+          { return (this->*m_vmt->start_point)(point); }
+  int end_point(String *point) const
+          { return (this->*m_vmt->end_point)(point); }
+  int exterior_ring(String *ring) const
+          { return (this->*m_vmt->exterior_ring)(ring); }
+  int centroid(String *point) const
+          { return (this->*m_vmt->centroid)(point); }
+
+  int point_n(uint32 num, String *result) const
+          { return (this->*m_vmt->point_n)(num, result); }
+  int interior_ring_n(uint32 num, String *result) const
+          { return (this->*m_vmt->interior_ring_n)(num, result); }
+  int geometry_n(uint32 num, String *result) const
+          { return (this->*m_vmt->geometry_n)(num, result); }
+
+public:
+  int create_from_wkb(const char *data, uint32 data_len);
+  int create_from_wkt(GTextReadStream *trs, String *wkt, int init_stream=1);
+  int init(int type_id)
+  {
+    m_vmt = find_class(type_id);
+    return !m_vmt;
+  }
+  int new_geometry(const char *name, size_t len)
+  {
+    m_vmt = find_class(name, len);
+    return !m_vmt;
+  }
+
+  int as_wkt(String *wkt) const
+  {
+    if(wkt->reserve(strlen(get_class_info()->m_name) + 2, 512))
+      return 1;
+    wkt->qs_append(get_class_info()->m_name);
+    wkt->qs_append('(');
+    if(get_data_as_text(wkt))
+      return 1;
+    wkt->qs_append(')');
+    return 0;
+  }
+
+  void init_from_wkb(const char *data, uint32 data_len)
+  {
+    m_data = data;
+    m_data_end = data + data_len;
+  }
+
+  void shift_wkb_header()
+  {
+    m_data += WKB_HEADER_SIZE;
+  }
+
+  int envelope(String *result) const;
+
+protected:
+  static GClassInfo *find_class(int type_id);
+  static GClassInfo *find_class(const char *name, size_t len);
+
+  bool no_data(const char *cur_data, uint32 data_amount) const
+  {
+    return cur_data + data_amount > m_data_end;
+  }
+
+  const char *m_data;
+  const char *m_data_end;
+};
+
+/***************************** Point *******************************/
+ 
+class GPoint: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+  
+  int get_xy(double *x, double *y) const
+  {
+    const char *data = m_data;
+    if(no_data(data, sizeof(double)) * 2) return 1;
+    float8get(*x, data);
+    float8get(*y, data + sizeof(double));
+    return 0;
+  }
+
+  int get_x(double *x) const
+  {
+    if(no_data(m_data, sizeof(double))) return 1;
+    float8get(*x, m_data);
+    return 0;
+  }
+
+  int get_y(double *y) const
+  {
+    const char *data = m_data;
+    if(no_data(data, sizeof(double)) * 2) return 1;
+    float8get(*y, data + sizeof(double));
+    return 0;
+  }
+
+  int dimension(uint32 *dim) const { *dim = 0; return 0; }
+};
+
+/***************************** LineString *******************************/
+
+class GLineString: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+  
+  int length(double *len) const;
+  int is_closed(int *closed) const;
+  int num_points(uint32 *n_points) const;
+  int start_point(String *point) const;
+  int end_point(String *point) const;
+  int point_n(uint32 n, String *result) const;
+  int dimension(uint32 *dim) const { *dim = 1; return 0; }
+//  IsRing
+};
+
+/***************************** Polygon *******************************/
+
+class GPolygon: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+  
+  int area(double *ar) const;
+  int exterior_ring(String *result) const;
+  int num_interior_ring(uint32 *n_int_rings) const;
+  int interior_ring_n(uint32 num, String *result) const;
+  int centroid_xy(double *x, double *y) const;
+  int centroid(String *result) const;
+  int dimension(uint32 *dim) const { *dim = 2; return 0; }
+//  PointOnSurface
+};
+
+/***************************** MultiPoint *******************************/
+
+class GMultiPoint: public Geometry
+{
+public:
+  size_t get_data_size() const;
+  int init_from_text(GTextReadStream *trs, String *wkb);
+  int get_data_as_text(String *txt) const;
+  int get_mbr(MBR *mbr) const;
+  int dimension(uint32 *dim) const { *dim = 0; return 0; }
+};
+
+/***************************** MultiLineString *******************************/
+
+class GMultiLineString: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+  
+  int length(double *len) const;
+  int is_closed(int *closed) const;
+  int dimension(uint32 *dim) const { *dim = 1; return 0; }
+};
+
+/***************************** MultiPolygon *******************************/
+
+class GMultiPolygon: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+
+  int area(double *ar) const;
+  int centroid(String *result) const;
+  int dimension(uint32 *dim) const { *dim = 2; return 0; }
+//  PointOnSurface
+};
+
+/***************************** GeometryCollection *******************************/
+
+class GGeometryCollection: public Geometry
+{
+public:
+   size_t get_data_size() const;
+   int init_from_text(GTextReadStream *trs, String *wkb);
+   int get_data_as_text(String *txt) const;
+   int get_mbr(MBR *mbr) const;
+
+  int num_geometries(uint32 *num) const;
+  int geometry_n(uint32 num, String *result) const;
+
+  int dimension(uint32 *dim) const;
+};
+
+#endif