bzr push into mysql-trunk branch (mattias.jonsson:4410 to 4411)

[Mattias Jonsson]

 4411 Mattias Jonsson	2012-09-01 [merge]
      merge

    modified:
      mysql-test/r/partition_mgm_err.result
      mysql-test/t/partition_mgm_err.test
 4410 Annamalai Gurusami	2012-09-01 [merge]
      Null merge from mysql-5.6 to mysql-5.7. 

=== modified file 'mysql-test/r/partition_mgm_err.result'
--- a/mysql-test/r/partition_mgm_err.result	revid:annamalai.gurusami@stripped
+++ b/mysql-test/r/partition_mgm_err.result	revid:mattias.jonsson@stripped
@@ -98,7 +98,7 @@ PARTITION BY KEY (a)
 (PARTITION x0, PARTITION x1);
 ALTER TABLE t1 ADD PARTITION PARTITIONS 0;
 ERROR HY000: At least one partition must be added
-ALTER TABLE t1 ADD PARTITION PARTITIONS 1024;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 8192;
 ERROR HY000: Too many partitions (including subpartitions) were defined
 ALTER TABLE t1 DROP PARTITION x0;
 ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions

=== modified file 'mysql-test/t/partition_mgm_err.test'
--- a/mysql-test/t/partition_mgm_err.test	revid:annamalai.gurusami@stripped
+++ b/mysql-test/t/partition_mgm_err.test	revid:mattias.jonsson@stripped
@@ -147,7 +147,7 @@ PARTITION BY KEY (a)
 ALTER TABLE t1 ADD PARTITION PARTITIONS 0;
 
 --error ER_TOO_MANY_PARTITIONS_ERROR
-ALTER TABLE t1 ADD PARTITION PARTITIONS 1024;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 8192;
 
 --error ER_ONLY_ON_RANGE_LIST_PARTITION
 ALTER TABLE t1 DROP PARTITION x0;

No bundle (reason: useless for push emails).