diff options
author | unknown <igor@rurik.mysql.com> | 2005-03-17 21:47:46 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-03-17 21:47:46 -0800 |
commit | 0f58efbd487dd1b82c6dd3b5e60304a168793eea (patch) | |
tree | 94ab95bbdfd76062fef924f256214c261124b49a /man/mysqld.1.in | |
parent | 7e9984b15657bd1a8cd7744ddbccdd071af8500f (diff) | |
parent | ee2633a7e2d21b55d814d7f34fd47d229409e0e5 (diff) | |
download | mariadb-git-0f58efbd487dd1b82c6dd3b5e60304a168793eea.tar.gz |
Manual merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/olap.result:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
Auto merged
Diffstat (limited to 'man/mysqld.1.in')
-rw-r--r-- | man/mysqld.1.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/man/mysqld.1.in b/man/mysqld.1.in index 719711edca2..73f07337f25 100644 --- a/man/mysqld.1.in +++ b/man/mysqld.1.in @@ -219,7 +219,7 @@ replace(1) .P For more information please refer to the MySQL reference manual, which may already be installed locally and which -is also available online at http://www.mysql.com/doc/en/ +is also available online at http://dev.mysql.com/doc/mysql/en .SH BUGS Please refer to http://bugs.mysql.com/ to report bugs. .SH AUTHOR |