Merge jcole@work.mysql.com:/home/bk/mysql

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql

BitKeeper/etc/logging_ok

@@ -7,3 +7,4 @@ sasha@mysql.sashanet.com
 serg@serg.mysql.com
 paul@central.snake.net
 jcole@main.burghcom.com
+jcole@tetra.spaceapes.com

Docs/manual.texi

@@ -12006,10 +12006,11 @@ communication.
 All other information is transferred as text that can be read by anyone
 who is able to watch the connection.  If you are concerned about this,
 you can use the compressed protocol (in @strong{MySQL} Version 3.22 and above)
-to make things much harder.  To make things even more secure you should
-use @code{ssh} (see @uref{http://www.cs.hut.fi/ssh}).  With this, you
-can get an encrypted TCP/IP connection between a @strong{MySQL} server
-and a @strong{MySQL} client.
+to make things much harder.  To make things even more secure you should use 
+@code{ssh}.  You can find an open source ssh client at 
+@uref{http://www.openssh.org}, and a commercial ssh client at 
+@uref{http://www.ssh.com}.  With this, you can get an encrypted TCP/IP 
+connection between a @strong{MySQL} server and a @strong{MySQL} client.
 
 To make a @strong{MySQL} system secure, you should strongly consider the
 following suggestions:
@@ -24093,52 +24094,52 @@ SUM_OVER_ALL_KEYS(max_length_of_key + sizeof(char*) * 2)
 @end menu
 
 @node BDB overview, BDB install, BDB, BDB
-@subsection Overview over BDB tables
+@subsection Overview of BDB Tables
 
-BDB tables are included in the @strong{MySQL} source distribution
-starting from 3.23.34 and will be activated in the @strong{MySQL}-max
+Support for BDB tables is included in the @strong{MySQL} source distribution
+starting from Version 3.23.34 and will be activated in the @strong{MySQL}-Max
 binary.
 
-Berkeley DB (@uref{http://www.sleepycat.com}) has provided
-@strong{MySQL} with a transaction-safe table handler. This will survive
-crashes and also provides @code{COMMIT} and @code{ROLLBACK} on
-transactions. The @strong{MySQL} source distribution comes with a BDB
-distribution that has a couple of small patches to make it work more
-smoothly with @strong{MySQL}.  You can't use a not-patched @code{BDB}
-version with @strong{MySQL}.
+BerkeleyDB, available at @uref{http://www.sleepycat.com/} has provided 
+@strong{MySQL} with a transactional table handler.  By using BerkeleyDB
+tables, your tables may have a greater chance of surviving crashes, and also
+provides @code{COMMIT} and @code{ROLLBACK} on transactions.  The 
+@strong{MySQL} source distribution comes with a BDB distribution that has a
+couple of small patches to make it work more smoothly with @strong{MySQL}.
+You can't use a non-patched @code{BDB} version with @strong{MySQL}.
 
-We at MySQL AB are working in close cooperating with Sleepycat to
-keep the quality of the @strong{MySQL} - BDB interface high.
+We at @strong{MySQL AB} are working in close cooperation with Sleepycat to
+keep the quality of the @strong{MySQL}/BDB interface high.
 
 When it comes to supporting BDB tables, we are committed to help our
 users to locate the problem and help creating a reproducable test case
 for any problems involving BDB tables.  Any such test case will be
 forwarded to Sleepycat who in turn will help us find and fix the
-problem.  As this is a two stage operating, any problems with BDB tables
-may take a little longer for us to fix than for other table handlers,
-but as the Berkeley code itself has been used by many other applications
-than @strong{MySQL} we don't envision any big problems with this.
-@xref{Table handler support}.
+problem.  As this is a two stage operation, any problems with BDB tables
+may take a little longer for us to fix than for other table handlers.
+However, as the BerkeleyDB code itself has been used by many other
+applications than @strong{MySQL}, we don't envision any big problems with
+this.  @xref{Table handler support}.
 
 @node BDB install, BDB start, BDB overview, BDB
 @subsection Installing BDB
 
 If you have downloaded a binary version of @strong{MySQL} that includes
-support for Berkeley DB, simply follow the instructions for
-installing a binary version of @strong{MySQL}. @xref{Installing binary}.
-@xref{mysqld-max}.
+support for BerkeleyDB, simply follow the instructions for installing a 
+binary version of @strong{MySQL}.  
+@xref{Installing binary}.  @xref{mysqld-max}.
 
 To compile @strong{MySQL} with Berkeley DB support, download @strong{MySQL}
-3.23.34 or newer and configure @code{MySQL} with the
-@code{--with-berkeley-db} option. @xref{Installing source}.
+Version 3.23.34 or newer and configure @code{MySQL} with the 
+@code{--with-berkeley-db} option.  @xref{Installing source}.
 
 @example
 cd /path/to/source/of/mysql-3.23.34
 ./configure --with-berkeley-db
 @end example
 
-Please refer to the manual provided by @code{BDB} distribution for
-more/updated information.
+Please refer to the manual provided with the @code{BDB} distribution for
+more updated information.
 
 Even though Berkeley DB is in itself very tested and reliable,
 the @strong{MySQL} interface is still considered beta quality.
@@ -34282,9 +34283,8 @@ Record file is crashed
 @item
 Got error ### from table handler
 
-To get more information about the error you can do @code{perror
-###}. Here is the most common errors that indicates a problem with the
-table:
+To get more information about the error you can run @code{perror ###}. Here 
+is the most common errors that indicates a problem with the table:
 
 @example
 shell> perror 126 127 132 134 135 136 141 144 145
@@ -34302,22 +34302,11 @@ shell> perror 126 127 132 134 135 136 141 144 145
 Note that error 135, no more room in record file, is not an error that
 can be fixed by a simple repair. In this case you have to do:
 
-@itemize @bullet
-@item
-@code{CREATE TABLE ...} for the table with proper @code{MAX_ROWS} and
-@code{AVG_ROW_LENGTH} values. @xref{CREATE TABLE}.
-@item
-Copy the data over from the old table with @code{INSERT INTO new_table
-SELECT * from old_table}.
-@item
-Rename the old table to the new table:
-@code{RENAME old_table to tmp_table, new_table to old_table}
-@item
-Delete the old table: @code{DROP TABLE tmp_table}.
-@end itemize
-@end itemize
+@example
+ALTER TABLE table MAX_ROWS=xxx AVG_ROW_LENGTH=yyy;
+@end example
 
-In these cases, you must repair your tables. @code{myisamchk}
+In the other cases, you must repair your tables. @code{myisamchk}
 can usually detect and fix most things that go wrong.
 
 The repair process involves up to four stages, described below. Before you
@@ -34327,12 +34316,12 @@ that @code{mysqld} runs as (and to you, because you need to access the files
 you are checking).  If it turns out you need to modify files, they must also
 be writable by you.
 
-If you are using @strong{MySQL} Version 3.23.16 and above, you can (and should) use the
-@code{CHECK} and @code{REPAIR} commands to check and repair @code{MyISAM}
-tables. @xref{CHECK TABLE}. @xref{REPAIR TABLE}.
+If you are using @strong{MySQL} Version 3.23.16 and above, you can (and 
+should) use the @code{CHECK} and @code{REPAIR} commands to check and repair 
+@code{MyISAM} tables.  @xref{CHECK TABLE}.  @xref{REPAIR TABLE}.
 
 The manual section about table maintenance includes the options to
-@code{isamchk}/@code{myisamchk}. @xref{Table maintenance}.
+@code{isamchk}/@code{myisamchk}.  @xref{Table maintenance}.
 
 The following section is for the cases where the above command fails or
 if you want to use the extended features that @code{isamchk}/@code{myisamchk} provides.
@@ -36252,6 +36241,10 @@ server closes the connection after 8 hours if nothing has happened. You
 can change the time limit by setting the @code{wait_timeout} variable when
 you start mysqld.
 
+Another common reason to receive the @code{MySQL server has gone away} error
+is because you have issued a ``close'' on your @strong{MySQL} connection
+and then tried to run a query on the closed connection.
+
 You can check that the @strong{MySQL} hasn't died by executing
 @code{mysqladmin version} and examining the uptime.