bzr commit into mysql-pe branch (satya.bn:3521) Bug#45816 Bug#46853

[Satya B]

#At file:///home/satya/WORK/45816/mysql-pe-45816/ based on revid:satya.bn@stripped

 3521 Satya B	2009-08-21
      Disable the testcase for BUG#45816 in partition.test in mysql-pe branch due to BUG#46853
      
      Commented out the testcase for Bug#45816 in mysql-pe branch
      due to valgrind warnings. Please see Bug#46853
      modified:
        mysql-test/r/partition.result
        mysql-test/t/partition.test

per-file messages:
  mysql-test/r/partition.result
    Disable the testcase for BUG#45816 due to BUG#46853
  mysql-test/t/partition.test
    Disable the testcase for BUG#45816 due to BUG#46853
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2009-08-06 12:41:22 +0000
+++ b/mysql-test/r/partition.result	2009-08-21 11:42:00 +0000
@@ -2068,23 +2068,4 @@ CREATE TABLE t1(id INT,KEY(id)) ENGINE=M
 PARTITION BY HASH(id) PARTITIONS 2;
 DROP TABLE t1;
 SET SESSION SQL_MODE=DEFAULT;
-#
-# BUG#45816 - assertion failure with index containing double 
-#             column on partitioned table
-#
-CREATE TABLE t1 (
-a INT DEFAULT NULL,
-b DOUBLE DEFAULT NULL,
-c INT DEFAULT NULL,
-KEY idx2(b,a)
-) PARTITION BY HASH(c) PARTITIONS 3;
-INSERT INTO t1 VALUES (6,8,9);
-INSERT INTO t1 VALUES (6,8,10);
-SELECT  1 FROM t1 JOIN t1 AS t2 USING (a) FOR UPDATE;
-1
-1
-1
-1
-1
-DROP TABLE t1;
 End of 5.1 tests

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2009-08-06 12:41:22 +0000
+++ b/mysql-test/t/partition.test	2009-08-21 11:42:00 +0000
@@ -2061,23 +2061,24 @@ CREATE TABLE t1(id INT,KEY(id)) ENGINE=M
 DROP TABLE t1;
 SET SESSION SQL_MODE=DEFAULT;
 
-
---echo #
---echo # BUG#45816 - assertion failure with index containing double 
---echo #             column on partitioned table
---echo #
-
-CREATE TABLE t1 (
-  a INT DEFAULT NULL,
-  b DOUBLE DEFAULT NULL,
-  c INT DEFAULT NULL,
-  KEY idx2(b,a)
-) PARTITION BY HASH(c) PARTITIONS 3;
-
-INSERT INTO t1 VALUES (6,8,9);
-INSERT INTO t1 VALUES (6,8,10);
-
-SELECT  1 FROM t1 JOIN t1 AS t2 USING (a) FOR UPDATE;
-
-DROP TABLE t1;
+# This testcase is commented due to the Bug #46853
+# Should be uncommented after fixing Bug #46853
+#--echo #
+#--echo # BUG#45816 - assertion failure with index containing double 
+#--echo #             column on partitioned table
+#--echo #
+#
+#CREATE TABLE t1 (
+#  a INT DEFAULT NULL,
+#  b DOUBLE DEFAULT NULL,
+#  c INT DEFAULT NULL,
+#  KEY idx2(b,a)
+#) PARTITION BY HASH(c) PARTITIONS 3;
+#
+#INSERT INTO t1 VALUES (6,8,9);
+#INSERT INTO t1 VALUES (6,8,10);
+#
+#SELECT  1 FROM t1 JOIN t1 AS t2 USING (a) FOR UPDATE;
+#
+#DROP TABLE t1;
 --echo End of 5.1 tests