Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
97da0c2c · unknown · 40914524 · 49f27976 · 97da0c2c · 97da0c2c
Commit 97da0c2c authored Mar 15, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

man/mysql.1.in man/mysql.1.in +1 -1

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -112,6 +112,7 @@ paul@central.snake.net
 paul@ice.local
 paul@ice.snake.net
 paul@kite-hub.kitebird.com
+paul@snake-hub.snake.net
 paul@teton.kitebird.com
 pem@mysql.com
 peter@linux.local

--- a/man/mysql.1.in
+++ b/man/mysql.1.in
@@ -107,7 +107,7 @@ version number and exit.
 Wait and retry if the database server connection is down.
 .SH FILES
 .TP 2.2i
-.I @sysconfdir@/my.cnf
+.I /etc/my.cnf
 MySQL configuration file
 .TP
 .I @bindir@/mysql