diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 8 | ||||
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | scripts/safe_mysqld.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql-multi.server.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 7902f10c3d3..fb534622f9b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,7 +1 @@ -heikki@donna.mysql.fi -miguel@linux.local -mikef@nslinux.bedford.progress.com -monty@donna.mysql.fi -monty@tik.mysql.fi -mwagner@evoq.mwagner.org -sasha@mysql.sashanet.com +jani@janikt.pp.saunalahti.fi diff --git a/Docs/manual.texi b/Docs/manual.texi index ead53187c27..04bd5cfd5af 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46707,7 +46707,7 @@ Added table locks to Berkeley DB. Fixed a bug with @code{LEFT JOIN} and @code{ORDER BY} where the first table had only one matching row. @item -Added 4 sample @code{my.cfg} example files in the @file{support-files} +Added 4 sample @code{my.cnf} example files in the @file{support-files} directory. @item Fixed @code{duplicated key} problem when doing big @code{GROUP BY}'s. diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 6c006e96768..6eda1740ad6 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -114,7 +114,7 @@ fi pid_file= err_log= -# Get first arguments from the my.cfg file, groups [mysqld] and [safe_mysqld] +# Get first arguments from the my.cnf file, groups [mysqld] and [safe_mysqld] # and then merge with the command line arguments if test -x ./bin/my_print_defaults then diff --git a/support-files/mysql-multi.server.sh b/support-files/mysql-multi.server.sh index af13009d038..6c940630427 100644 --- a/support-files/mysql-multi.server.sh +++ b/support-files/mysql-multi.server.sh @@ -65,7 +65,7 @@ parse_arguments() { done } -# Get arguments from the my.cfg file, groups [mysqld], [mysql_server], +# Get arguments from the my.cnf file, groups [mysqld], [mysql_server], # and mysql_multi_server if test -x ./bin/my_print_defaults then diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 9307a2e3eb2..62381ccf0d3 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -53,7 +53,7 @@ parse_arguments() { done } -# Get arguments from the my.cfg file, groups [mysqld] and [mysql_server] +# Get arguments from the my.cnf file, groups [mysqld] and [mysql_server] if test -x ./bin/my_print_defaults then print_defaults="./bin/my_print_defaults" |