Fix error messages. Someone pushed a change to an error message but did not update the tests.

AKA someone pushed without testing.

mysql-test/r/partition_02myisam.result

@@ -1160,12 +1160,12 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 (PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (21' at line 3
 CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
 PARTITION BY HASH(f1) PARTITIONS 1000000;
-ERROR HY000: Too many partitions were defined
+ERROR HY000: Too many partitions (including subpartitions) were defined
 CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
 PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
 SUBPARTITIONS 1000000
 (PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR HY000: Too many partitions were defined
+ERROR HY000: Too many partitions (including subpartitions) were defined
 # 3.2.4 partition/subpartition numbers STRING notation
 CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
 PARTITION BY HASH(f1) PARTITIONS '2';