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

@@ -41044,7 +41044,7 @@ Returns the error number for the most recently invoked MySQL function.
 Returns the error message for the most recently invoked MySQL function.
 
 @item @strong{mysql_real_escape_string()} @tab
-Escapes special characters in a string for use in a SQL statement taking
+Escapes special characters in a string for use in a SQL statement, taking
 into account the current charset of the connection.
 
 @item @strong{mysql_escape_string()} @tab
@@ -51013,6 +51013,8 @@ Fixed coredump in LOAD_FILE(NULL).
 
 @itemize @bullet
 @item
+Added @code{mysql_real_escape_string()} function to the MySQL C API.
+@item
 Fixed a bug in @code{CONCAT()} where one of the arguments was a function
 that returned a modified argument.
 @item