bk commit into 5.0 tree (gkodinov:1.2419)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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@stripped, 2007-03-26 14:14:23+03:00, gkodinov@stripped +3 -0
  Merge magare.gmz:/home/kgeorge/mysql/work/B27164-4.1-opt
  into  magare.gmz:/home/kgeorge/mysql/work/B27164-5.0-opt
  MERGE: 1.1616.2877.69

  mysql-test/r/gis.result@stripped, 2007-03-26 14:14:21+03:00, gkodinov@stripped +1 -1
    merge 4.1-opt -> 5.0-opt
    MERGE: 1.15.1.10

  mysql-test/t/gis.test@stripped, 2007-03-26 14:09:40+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.17.1.6

  sql/field.h@stripped, 2007-03-26 14:14:21+03:00, gkodinov@stripped +1 -2
    merge 4.1-opt -> 5.0-opt
    MERGE: 1.120.1.17

# 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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B27164-5.0-opt/RESYNC

--- 1.198/sql/field.h	2007-03-22 11:58:11 +02:00
+++ 1.199/sql/field.h	2007-03-26 14:14:21 +03:00
@@ -1284,7 +1284,7 @@ public:
   int  store_decimal(const my_decimal *);
   void get_key_image(char *buff,uint length,imagetype type);
   uint size_of() const { return sizeof(*this); }
-  int  reset(void) { return !maybe_null(); }
+  int  reset(void) { return !maybe_null() || Field_blob::reset(); }
 };
 #endif /*HAVE_SPATIAL*/
 

--- 1.41/mysql-test/r/gis.result	2007-03-02 13:09:43 +02:00
+++ 1.42/mysql-test/r/gis.result	2007-03-26 14:14:21 +03:00
@@ -730,6 +730,12 @@ point(b, b) IS NULL	linestring(b) IS NUL
 1	1	1	1	1	1	1
 0	1	1	1	1	1	1
 drop table t1;
+CREATE TABLE t1(a POINT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (NULL);
+SELECT * FROM t1;
+a
+NULL
+DROP TABLE t1;
 End of 4.1 tests
 create table t1 (s1 geometry not null,s2 char(100));
 create trigger t1_bu before update on t1 for each row set new.s1 = null;

--- 1.34/mysql-test/t/gis.test	2007-03-02 13:09:43 +02:00
+++ 1.35/mysql-test/t/gis.test	2007-03-26 14:09:40 +03:00
@@ -423,6 +423,14 @@ from t1;
 
 drop table t1;
 
+#
+# Bug #27164: Crash when mixing InnoDB and MyISAM Geospatial tables
+#
+CREATE TABLE t1(a POINT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (NULL);
+SELECT * FROM t1;
+DROP TABLE t1;
+
 --echo End of 4.1 tests
 
 #