Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into teton.kitebird.com:/home/paul/mysql-4.1

support-files/my-huge.cnf.sh

@@ -10,8 +10,8 @@
 # ~/.my.cnf to set user-specific options.
 #
 # One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# If you want to know which options a program supports, run the program
+# with the --help option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-innodb-heavy-4G.cnf.sh

@@ -317,7 +317,7 @@ key_buffer_size = 32M
 read_buffer_size = 2M
 
 # When reading rows in sorted order after a sort, the rows are read
-# through this buffer to avoid a disk seeks. You can improve ORDER BY
+# through this buffer to avoid disk seeks. You can improve ORDER BY
 # performance a lot, if set this to a high value.
 # Allocated per thread, when needed.
 read_rnd_buffer_size = 16M
@@ -331,7 +331,7 @@ read_rnd_buffer_size = 16M
 bulk_insert_buffer_size = 64M
 
 # This buffer is allocated when MySQL needs to rebuild the index in
-# REPAIR, OPTIMZE, ALTER table statements as well as in LOAD DATA INFILE
+# REPAIR, OPTIMIZE, ALTER table statements as well as in LOAD DATA INFILE
 # into an empty table. It is allocated per thread so be careful with
 # large settings.
 myisam_sort_buffer_size = 128M

support-files/my-large.cnf.sh

@@ -10,8 +10,8 @@
 # ~/.my.cnf to set user-specific options.
 #
 # One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# If you want to know which options a program supports, run the program
+# with the --help option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-medium.cnf.sh

@@ -11,8 +11,8 @@
 # ~/.my.cnf to set user-specific options.
 #
 # One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# If you want to know which options a program supports, run the program
+# with the --help option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-small.cnf.sh

@@ -11,8 +11,8 @@
 # ~/.my.cnf to set user-specific options.
 #
 # One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# If you want to know which options a program supports, run the program
+# with the --help option.
 
 # The following options will be passed to all MySQL clients
 [client]