Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


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

mysql-test/r/repair.result

@@ -89,7 +89,7 @@ SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
 CREATE TABLE t1(a CHAR(255), KEY(a));
-SET myisam_sort_buffer_size=4196;
+SET myisam_sort_buffer_size=4496;
 INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

mysql-test/t/repair.test

@@ -88,7 +88,7 @@ DROP TABLE t1;
 #              myisam_sort_buffer_size
 #
 CREATE TABLE t1(a CHAR(255), KEY(a));
-SET myisam_sort_buffer_size=4196;
+SET myisam_sort_buffer_size=4496;
 INSERT INTO t1 VALUES
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),
 ('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),