diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-15 14:40:16 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-15 14:40:16 +0200 |
| commit | c8e834e995712cf695ce6bef5362be54f77ad774 (patch) | |
| tree | 51216dcfd12d0f584a7684eede9989497a6f0743 | |
| parent | 10852be938b545af8a60b5357686d6f695932e89 (diff) | |
| parent | 6d0ec316a84fc85d8e327dafdf30aaccb0024b34 (diff) | |
| download | mariadb-git-c8e834e995712cf695ce6bef5362be54f77ad774.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | man/mysql.1.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f8621170f64..ef04f36c433 100644 --- 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 diff --git a/man/mysql.1.in b/man/mysql.1.in index 35ff48693e1..7330ac8125b 100644 --- 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 |