Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976


mysql-test/r/repair.result:
  Auto merged

mysql-test/r/repair.result

@@ -79,7 +79,7 @@ INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0');
 Warnings:
-Error	1034	sort_buffer_size is to small
+Error	1034	myisam_sort_buffer_size is too small
 Error	1034	Number of rows changed from 0 to 157
 SET myisam_repair_threads=2;
 REPAIR TABLE t1;