summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <heikki@donna.mysql.fi>2001-05-23 19:43:16 +0300
committerunknown <heikki@donna.mysql.fi>2001-05-23 19:43:16 +0300
commitf68e5ce76a9e14b629dfcfb2290bc03ea63f1aac (patch)
tree3dba102a08c63b61cf64838d89b2265170f880b0
parent2f8dfb3f4a13e8cd205e490722fb298712257ebf (diff)
parenta4abfe6a47b03618fe7c3ce5a3a2f32f04d8c4f4 (diff)
downloadmariadb-git-f68e5ce76a9e14b629dfcfb2290bc03ea63f1aac.tar.gz
Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqle BitKeeper/etc/logging_ok: auto-union
-rw-r--r--BitKeeper/etc/logging_ok5
-rw-r--r--Docs/manual.texi13
2 files changed, 13 insertions, 5 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 11b5f930d29..5fb0381538f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,4 +1,5 @@
+heikki@donna.mysql.fi
jani@janikt.pp.saunalahti.fi
-monty@tik.mysql.fi
monty@donna.mysql.fi
-heikki@donna.mysql.fi
+monty@tik.mysql.fi
+paul@central.snake.net
diff --git a/Docs/manual.texi b/Docs/manual.texi
index da569c67dd1..7702d2dad10 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -9207,9 +9207,10 @@ You should now have an ODBC connection to @strong{MySQL}, encrypted using SSH.
@node Windows symbolic links, Windows compiling, Windows and SSH, Windows
@subsection Splitting Data Across Different Disks on Windows
-Beginning with @strong{MySQL} Version 3.23.16, the @strong{MySQL}
-distribution is compiled with the @code{-DUSE_SYMDIR} option. This allows
-you to put a database on different disk by adding a symbolic link to it
+Beginning with @strong{MySQL} Version 3.23.16, the @code{mysqld-max}
+and @code{mysql-max-nt} servers in the @strong{MySQL} distribution are
+compiled with the @code{-DUSE_SYMDIR} option. This allows you to put a
+database on different disk by adding a symbolic link to it
(in a manner similar to the way that symbolic links work on Unix).
On Windows, you make a symbolic link to a database by creating a file
@@ -26147,6 +26148,12 @@ The menagerie database will be simple (deliberately), but it is not difficult
to think of real-world situations in which a similar type of database might
be used. For example, a database like this could be used by a farmer to keep
track of livestock, or by a veterinarian to keep track of patient records.
+A menagerie distribution containing some of the queries and sample data used
+in the following sections can be obtained from the @strong{MySQL} Web site.
+It's available in either
+@uref{http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz,compressed @code{tar} format}
+or
+@uref{http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip,Zip format}.
Use the @code{SHOW} statement to find out what databases currently exist
on the server: