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

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

Docs/manual.texi

@@ -48921,12 +48921,13 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
 
 @itemize @bullet
 @item
-New configure option --without-query-cache. 
+New configure option @code{--without-query-cache}. 
 @item
 Memory allocation strategy for 'root memory' changed. Block size now grows 
 with number of allocated blocks.
 @item
-@code{INET_NTOA()} now returns @code{NULL} if you give it a too big argument.
+@code{INET_NTOA()} now returns @code{NULL} if you give it an argument that
+is too large (greater than the value corresponding to @code{255.255.255.255}).
 @item
 Fix @code{SQL_CALC_FOUND_ROWS} to work with @code{UNION}s. It will work only
 if the first @code{SELECT} has this option and if there is global @code{LIMIT}