Merge work:/home/bk/mysql into narttu.mysql.fi:/my/bk/mysql

Docs/manual.texi:
  Auto merged

1 files changed, 13 insertions, 2 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index b0d874809a4..3cdb35d5060 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -17598,7 +17598,7 @@ The options work for all table types, if not otherwise indicated:
 
 @multitable @columnfractions .20 .80
 @item @code{AUTO_INCREMENT} @tab The next auto_increment value you want to set for your table (MyISAM).
-@item @code{AVG_ROW_LENGTH} @tab An approximation of the average row length for your table. You only need to set this for tables with variable size records.
+@item @code{AVG_ROW_LENGTH} @tab An approximation of the average row length for your table. You only need to set this for large tables with variable size records.
 @item @code{CHECKSUM} @tab Set this to 1 if you want @strong{MySQL} to maintain a checksum for all rows (makes the table a little slower to update but makes it easier to find corrupted tables) (MyISAM).
 @item @code{COMMENT} @tab A 60-character comment for your table.
 @item @code{MAX_ROWS} @tab Max number of rows you plan to store in the table.
@@ -17613,7 +17613,8 @@ When you use a @code{MyISAM} table, @strong{MySQL} uses the product of
 @code{max_rows * avg_row_length} to decide how big the resulting table
 will be.  If you don't specify any of the above options, the maximum size
 for a table will be 4G (or 2G if your operating systems only supports 2G
-tables).
+tables). The reason for this is just to keep down the pointer sizes
+to make the index smaller and faster if you don't really need big files.
 
 If you don't use @code{PACK_KEYS}, the default is to only pack strings,
 not numbers.  If you use @code{PACK_KEYS=1}, numbers will be packed as well.
@@ -38905,6 +38906,16 @@ though, so Version 3.23 is not released as a stable version yet.
 @appendixsubsec Changes in release 3.23.29
 @itemize @bullet
 @item
+Applied patches for OS2 by @code{Yuri Dario}.
+@item
+@code[FLUSH TABLES table_name} didn't always flush table properly to
+disk; One some cases the index tree wasn't completely written to disk.
+@item
+@code{--bootstrap} is now run in a separate thread. This fixes the problem
+that @code{mysql_install_db} core dumped on some Linux machines.
+@item
+Changed @code{mi_create()} to use less stack.
+@item
 Changed crash-me and the MySQL benchmarks to also work with FrontBase.
 @item
 Allow @code{RESTRICT} and @code{CASCADE} after @code{DROP TABLE} to make