Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug15820

mysql-test/r/partition_mgm_err.result

@@ -140,3 +140,5 @@ t1	CREATE TABLE `t1` (
   `a` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY (a) PARTITIONS 2 
 DROP TABLE t1;
+CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
+ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

mysql-test/t/partition_mgm_err.test

@@ -210,3 +210,9 @@ SHOW CREATE TABLE t1;
 ALTER TABLE t1 PARTITION BY KEY(a) PARTITIONS 2;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
+
+#
+#BUG 15820 create table with 1 partition, doing ALTER TABLE ADD PARTITION fails
+#
+CREATE TABLE t1 (a INT) PARTITION BY HASH(a);
+ALTER TABLE t1 ADD PARTITION PARTITIONS 4;