bk commit into 5.1 tree (guilhem:1.2573) BUG#35570

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem.  When guilhem 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, 2008-04-10 17:00:03+02:00, guilhem@stripped +2 -0
  Manual merge from 5.0 of the test for the fix for BUG#35570 "CHECKSUM
  TABLE unreliable if LINESTRING field (same content/ differen checksum)"

  mysql-test/r/myisam.result@stripped, 2008-04-10 17:00:00+02:00, guilhem@stripped +15 -0
    checksums are identical; without the code fix they were all different

  mysql-test/t/myisam.test@stripped, 2008-04-10 17:00:00+02:00, guilhem@stripped +15 -0
    test that same tables give same checksums

diff -Nrup a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
--- a/mysql-test/r/myisam.result	2008-04-10 16:51:15 +02:00
+++ b/mysql-test/r/myisam.result	2008-04-10 17:00:00 +02:00
@@ -1832,6 +1832,21 @@ id	ref
 3	2
 4	5
 DROP TABLE t1, t2;
+CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam;
+INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)"));
+checksum table t1;
+Table	Checksum
+test.t1	326284887
+CREATE TABLE t2 (line LINESTRING NOT NULL) engine=myisam;
+INSERT INTO t2 VALUES (GeomFromText("POINT(0 0)"));
+checksum table t2;
+Table	Checksum
+test.t2	326284887
+CREATE TABLE t3 select * from t1;
+checksum table t3;
+Table	Checksum
+test.t3	326284887
+drop table t1,t2,t3;
 End of 5.0 tests
 create table t1 (a int not null, key `a` (a) key_block_size=1024);
 show create table t1;
diff -Nrup a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
--- a/mysql-test/t/myisam.test	2008-04-10 16:51:26 +02:00
+++ b/mysql-test/t/myisam.test	2008-04-10 17:00:00 +02:00
@@ -1169,6 +1169,21 @@ SELECT * FROM t1;
 
 DROP TABLE t1, t2;
 
+#
+# Test of BUG#35570 CHECKSUM TABLE unreliable if LINESTRING field
+# (same content / differen checksum)
+#
+
+CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam;
+INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)"));
+checksum table t1;
+CREATE TABLE t2 (line LINESTRING NOT NULL) engine=myisam;
+INSERT INTO t2 VALUES (GeomFromText("POINT(0 0)"));
+checksum table t2;
+CREATE TABLE t3 select * from t1;
+checksum table t3;
+drop table t1,t2,t3;
+
 --echo End of 5.0 tests