Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1

mysql-test/t/alter_table.test

@@ -340,7 +340,9 @@ drop table t1;
 #
 # BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000)
 #
+# Some platforms (Mac OS X, Windows) will send the error message using small letters.
 CREATE TABLE T12207(a int) ENGINE=MYISAM;
+--replace_result t12207 T12207
 --error 1031
 ALTER TABLE T12207 DISCARD TABLESPACE;
 DROP TABLE T12207;