bzr push into mysql-trunk branch (ashish.y.agarwal:3633 to 3634) Bug#11760213

[Ashish Agarwal]

 3634 Ashish Agarwal	2011-11-22
      BUG#11760213 - 52599: ALTER TABLE REMOVE PARTITIONING ON
                            NON-PARTITIONED TABLE CORRUPTS MYISAM.
      
      NOTE: A test was failing, so this is a followup
            patch to fix it.

    modified:
      mysql-test/suite/parts/inc/partition_alter3.inc
      mysql-test/suite/parts/r/partition_alter3_myisam.result
 3633 Jimmy Yang	2011-11-21
      Modify innodb-fts-stopword.test and innodb_fts_transaction.test to
      add wait_until_disconnected.inc after each connection disconnetion

    modified:
      mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result
      mysql-test/suite/innodb_fts/t/innodb-fts-stopword.test
      mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
=== modified file 'mysql-test/suite/parts/inc/partition_alter3.inc'
--- a/mysql-test/suite/parts/inc/partition_alter3.inc	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_alter3.inc	2011-11-22 05:45:59 +0000
@@ -115,6 +115,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.2.7 Remove partitioning from not partitioned table --> ????
+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
@@ -193,6 +194,7 @@ ALTER TABLE t1 REMOVE PARTITIONING;
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.2.7 Remove partitioning from not partitioned table --> ????
+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc

=== modified file 'mysql-test/suite/parts/r/partition_alter3_myisam.result'
--- a/mysql-test/suite/parts/r/partition_alter3_myisam.result	2010-10-26 10:10:58 +0000
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result	2011-11-22 05:45:59 +0000
@@ -463,6 +463,7 @@ id	select_type	table	partitions	type	pos
 # check read row by row success: 1
 #  1.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
+ERROR HY000: Partition management on a not partitioned table is not possible
 DROP TABLE t1;
 
 #========================================================================
@@ -882,6 +883,7 @@ id	select_type	table	partitions	type	pos
 # check read row by row success: 1
 #  2.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
+ERROR HY000: Partition management on a not partitioned table is not possible
 DROP TABLE t1;
 DROP VIEW  IF EXISTS v1;
 DROP TABLE IF EXISTS t1;

No bundle (reason: useless for push emails).