Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -26730,7 +26730,7 @@ following circumstances:
 When the cache is full and a thread tries to open a table that is not in
 the cache.
 @item
-When the cache contains more than @code{table_cache} entires and
+When the cache contains more than @code{table_cache} entries and
 a thread is no longer using a table.
 @item
 When someone executes @code{mysqladmin refresh} or
@@ -41868,12 +41868,11 @@ None.
 
 You should use @code{mysql_real_escape_string()} instead!
 
-This is identical to @code{mysql_real_escape_string()} except that it
-takes the connection as the first
-argument. @code{mysql_real_escape_string()} will escape the string
-according to the current character set while
-@code{mysql_escape_string()} does not respect the current charset
-setting.
+This function is identical to @code{mysql_real_escape_string()} except
+that @code{mysql_real_escape_string()} takes a connection handler as
+its first argument and escapes the string according to the current
+character set.  @code{mysql_escape_string()} does not take a connection
+argument and does not respect the current charset setting.
 
 
 @node mysql_fetch_field, mysql_fetch_fields, mysql_escape_string, C API functions
@@ -43492,6 +43491,8 @@ threaded client. @xref{Threaded clients}.
 
 @findex @code{my_init()}
 
+@code{void my_init(void)}
+
 @subsubheading Description
 
 This function needs to be called once in the program before calling any
@@ -43504,13 +43505,15 @@ This is automatically called by @code{mysql_init()},
 
 @subsubheading Return Values
 
-none.
+None.
 
 @node mysql_thread_init, mysql_thread_end, my_init, C Thread functions
 @subsubsection @code{mysql_thread_init()}
 
 @findex @code{mysql_thread_init()}
 
+@code{my_bool mysql_thread_init(void)}
+
 @subsubheading Description
 
 This function needs to be called for each created thread to initialise
@@ -43520,13 +43523,15 @@ This is automatically called by @code{my_init()} and @code{mysql_connect()}.
 
 @subsubheading Return Values
 
-none.
+None.
 
 @node mysql_thread_end,  , mysql_thread_init, C Thread functions
 @subsubsection @code{mysql_thread_end()}
 
 @findex @code{mysql_thread_end()}
 
+@code{void mysql_thread_end(void)}
+
 @subsubheading Description
 
 This function needs to be called before calling @code{pthread_exit()} to
@@ -43537,7 +43542,7 @@ library.  It must be called explicitly to avoid a memory leak.
 
 @subsubheading Return Values
 
-none.
+None.
 
 @node C Embedded Server func, C API problems, C Thread functions, C
 @subsection C Embedded Server Function Descriptions
@@ -43623,6 +43628,8 @@ int main(void) @{
 
 @findex @code{mysql_server_end()}
 
+@code{void mysql_server_end(void)}
+
 @subsubheading Description
 
 This function @strong{must} be called once in the program after
@@ -43630,7 +43637,7 @@ all other MySQL functions.  It shuts down the embedded server.
 
 @subsubheading Return Values
 
-none.
+None.
 
 @node C API problems, Building clients, C Embedded Server func, C
 @subsection Common questions and problems when using the C API
@@ -51792,7 +51799,7 @@ Added @code{--default-table-type} option to @code{mysqld}.
 @cindex changes, version 3.22
 
 The 3.22 version has faster and safer connect code than version 3.21, as well
-as a lot of new nice enhancements.  The reason for not including these changes
+as a lot of new nice enhancements.
 As there aren't really any major changes, upgrading from 3.21 to 3.22 should
 be very easy and painless.  @xref{Upgrading-from-3.21}.