Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Docs/manual.texi:
  Auto merged
myisam/mi_write.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

4 files changed, 23 insertions, 119 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 9e906c000f0..9e52ea95850 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -1635,14 +1635,6 @@ server.
 Contact us at @email{trademark@@mysql.com} to inquire about special
 arrangements to fit your needs.
 
-
-@menu
-* When need MySQL logo permission::  
-* MySQL AB Partnership Logos::  
-* Using MySQL word in presentations::  
-* Using MySQL word in company and product names::  
-@end menu
-
 @node When need MySQL logo permission, MySQL AB Partnership Logos, MySQL Logos that may be Used Without Written Permission, MySQL AB Logos and Trademarks
 @subsubsection When do you need a Written Permission to use MySQL Logos?
 
@@ -3414,8 +3406,6 @@ and line terminator characters of more than 1 character.
 The following problems are known and will be fixed in due time:
 
 @itemize @bullet
-@item
-For the moment @code{MATCH} only works with @code{SELECT} statements.
 
 @item
 When using @code{SET CHARACTER SET}, one can't use translated
@@ -5038,12 +5028,8 @@ For the Windows distribution, please see @ref{Windows installation}.
 @cindex installing, binary distribution
 @cindex binary distributions, installing
 
-For the Windows distribution, please see @ref{Windows binary installation}.
-
-@menu
-* Linux-RPM::                   Linux RPM files
-* Building clients::            Building client programs
-@end menu
+See also @ref{Windows binary installation}, 
+@ref{Linux-RPM}, and @ref{Building clients}.
 
 You need the following tools to install a MySQL binary distribution:
 
@@ -8739,12 +8725,7 @@ it with a trace file or under @code{gdb}.  @xref{Using gdb on mysqld}.
 * FreeBSD::                     FreeBSD Notes
 * NetBSD::                      NetBSD notes
 * OpenBSD::                     OpenBSD Notes
-* OpenBSD 2.5::                 OpenBSD 2.5 Notes
-* OpenBSD 2.8::                 OpenBSD 2.8 Notes
 * BSDI::                        BSD/OS Notes
-* BSDI2::                       BSD/OS Version 2.x Notes
-* BSDI3::                       BSD/OS Version 3.x Notes
-* BSDI4::                       BSD/OS Version 4.x Notes
 @end menu
 
 
@@ -8852,7 +8833,7 @@ crash when @code{make} tries to run @code{lint} on C++ files.
 
 This section contains notes on OpenBSD.
 
-@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes
+@node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, OpenBSD
 @subsubsection OpenBSD 2.5 Notes
 
 On OpenBSD Version 2.5, you can compile MySQL with native threads
@@ -8863,7 +8844,7 @@ CFLAGS=-pthread CXXFLAGS=-pthread ./configure --with-mit-threads=no
 @end example
 
 
-@node OpenBSD 2.8, BSDI, OpenBSD 2.5, BSD Notes
+@node OpenBSD 2.8, BSDI, OpenBSD 2.5, OpenBSD
 @subsubsection OpenBSD 2.8 Notes
 
 Our users have reported that OpenBSD 2.8 has a threading bug which causes
@@ -8884,7 +8865,7 @@ usage, and crashes.
 
 This section contains notes on BSD/OS.
 
-@node BSDI2, BSDI3, BSDI, BSD Notes
+@node BSDI2, BSDI3, BSDI, BSDI
 @subsubsection BSD/OS Version 2.x Notes
 
 If you get the following error when compiling MySQL, your
@@ -8909,7 +8890,7 @@ If you get problems with the current date in MySQL, setting the
 @code{TZ} variable will probably help.  @xref{Environment variables}.
 
 
-@node BSDI3, BSDI4, BSDI2, BSD Notes
+@node BSDI3, BSDI4, BSDI2, BSDI
 @subsubsection BSD/OS Version 3.x Notes
 
 Upgrade to BSD/OS Version 3.1.  If that is not possible, install
@@ -8950,7 +8931,7 @@ If this doesn't work and you are using @code{bash}, try switching to
 @code{bash} and @code{ulimit}.
 
 
-@node BSDI4,  , BSDI3, BSD Notes
+@node BSDI4,  , BSDI3, BSDI
 @subsubsection BSD/OS Version 4.x Notes
 
 BSDI Version 4.x has some thread-related bugs.  If you want to use
@@ -9801,12 +9782,6 @@ CC=cc CXX=CC ./configure --prefix=/usr/local/mysql
 
 If you want to use @code{gcc}, you must use @code{gcc} 2.95.2 or newer.
 
-
-@menu
-* OS/2::                        OS/2 Notes
-@end menu
-
-
 @node OS/2, BeOS, Other Unix Notes, Operating System Specific Notes
 @subsection OS/2 Notes
 
@@ -13284,11 +13259,7 @@ start them with @code{./bin/safe_mysqld} then in most cases the only
 option you need to add/change is the @code{socket} and @code{port}
 argument to @code{safe_mysqld}.
 
-
-@menu
-* Multiple servers::            Running Multiple MySQL Servers on the Same Machine
-@end menu
-
+@xref{Multiple servers, ,Running Multiple MySQL Servers on the Same Machine}.
 
 @node Multiple servers,  , Installing many servers, Configuring MySQL
 @subsection Running Multiple MySQL Servers on the Same Machine
@@ -13833,12 +13804,12 @@ privileges according to your identity and @strong{what you want to do}.
 MySQL considers both your hostname and user name in identifying you
 because there is little reason to assume that a given user name belongs to
 the same person everywhere on the Internet.  For example, the user
-@code{bill} who connects from @code{whitehouse.gov} need not be the same
-person as the user @code{bill} who connects from @code{microsoft.com}.
+@code{joe} who connects from @code{office.com} need not be the same
+person as the user @code{joe} who connects from @code{elsewhere.com}.
 MySQL handles this by allowing you to distinguish users on different
-hosts that happen to have the same name:  you can grant @code{bill} one set
-of privileges for connections from @code{whitehouse.gov}, and a different set
-of privileges for connections from @code{microsoft.com}.
+hosts that happen to have the same name:  you can grant @code{joe} one set
+of privileges for connections from @code{office.com}, and a different set
+of privileges for connections from @code{elsewhere.com}.
 
 MySQL access control involves two stages:
 
@@ -16465,14 +16436,6 @@ tables while you are running @code{myisamchk}.  In MySQL Version 3.23
 the easiest way to avoid this problem is to use @code{CHECK TABLE}
 instead of @code{myisamchk} to check tables.
 
-@menu
-* myisamchk general options::   General Options for @code{myisamchk}
-* myisamchk check options::     Check Options for @code{myisamchk}
-* myisamchk repair options::    Repair Options for myisamchk
-* myisamchk other options::     Other Options for @code{myisamchk}
-@end menu
-
-
 @node myisamchk general options, myisamchk check options, myisamchk syntax, Table maintenance
 @subsubsection General Options for @code{myisamchk}
 
@@ -17702,12 +17665,6 @@ If the thread is waiting for free disk space in a @code{write} call, the
 write is aborted with an disk full error message.
 @end itemize
 
-
-@menu
-* SHOW::                        @code{SHOW} Syntax
-@end menu
-
-
 @node SHOW,  , KILL, Database Administration
 @subsection @code{SHOW} Syntax
 
@@ -18449,7 +18406,8 @@ After this many write locks, allow some read locks to run in between.
 MySQL uses special tree-like cache to make bulk inserts (that is,
 @code{INSERT ... SELECT}, @code{INSERT ... VALUES (...), (...), ...}, and
 @code{LOAD DATA INFILE}) faster. This variable limits
-the size of the cache tree in bytes per thread.
+the size of the cache tree in bytes per thread. Setting it to 0
+will disable this optimization.
 @strong{Note:} This cache is only used when adding data to non-empty table.
 Default value is 8 MB.
 
@@ -22009,15 +21967,6 @@ of the master's binary log is has processed. @strong{Do not} remove or
 edit the file, unless you really know what you are doing. Even in that case,
 it is preferred that you use @code{CHANGE MASTER TO} command.
 
-@menu
-* Replication Features::        Replication Features and Known Problems
-* Replication Options::         Replication Options in my.cnf
-* Replication SQL::             SQL Commands Related to Replication
-* Replication FAQ::             Replication FAQ
-* Replication Problems::        Troubleshooting Replication
-@end menu
-
-
 @node Replication Features, Replication Options, Replication HOWTO, Replication
 @subsection Replication Features and Known Problems
 
@@ -24971,16 +24920,6 @@ part of the rows, MySQL will use an index anyway, as it can
 much more quickly find the few rows to return in the result.
 @end itemize
 
-
-@menu
-* Indexes::                     Column Indexes
-* Multiple-column indexes::     Multiple-Column Indexes
-* Table cache::                 How MySQL Opens and Closes Tables
-* Creating many tables::        Drawbacks to Creating Large Numbers of Tables in the Same Database
-* Open tables::                 Why So Many Open tables?
-@end menu
-
-
 @node Indexes, Multiple-column indexes, MySQL indexes, Optimising Database Structure
 @subsection Column Indexes
 
@@ -25828,13 +25767,7 @@ command when inserting an @code{AUTO_INCREMENT} value.  This is mainly used
 with the update log.
 @end table
 
-
-@menu
-* SET TRANSACTION::             @code{SET TRANSACTION} Syntax
-@end menu
-
-
-
+@xref{SET TRANSACTION}.
 
 @node Disk issues,  , Optimising the Server, MySQL Optimisation
 @section Disk Issues
@@ -26375,11 +26308,6 @@ or export formats (@code{LOAD DATA INFILE}, @code{SELECT ... INTO OUTFILE}).
 @cindex columns, names
 @cindex aliases, names
 
-@menu
-* Name case sensitivity::       Case sensitivity in names
-@end menu
-
-
 Database, table, index, column, and alias names all follow the same rules in
 MySQL.
 
@@ -26577,12 +26505,6 @@ SELECT (@@aa:=id) AS a, (@@aa+3) AS b FROM table_name HAVING b=5;
 The reason is that @code{@@aa} will not contain the value of the current
 row, but the value of @code{id} for the previous accepted row.
 
-
-@menu
-* Comments::                    Comment Syntax
-* Reserved words::              Is MySQL Picky About Reserved Words?
-@end menu
-
 @node Comments, Reserved words, Variables, Language Structure
 @subsection Comment Syntax
 
@@ -32775,16 +32697,6 @@ exist.
 @cindex @code{mysqladmin}
 You can also drop databases with @code{mysqladmin}. @xref{Client-Side Scripts}.
 
-
-@menu
-* CREATE TABLE::                @code{CREATE TABLE} Syntax
-* ALTER TABLE::                 @code{ALTER TABLE} Syntax
-* RENAME TABLE::                @code{RENAME TABLE} Syntax
-* DROP TABLE::                  @code{DROP TABLE} Syntax
-* CREATE INDEX::                @code{CREATE INDEX} Syntax
-* DROP INDEX::                  @code{DROP INDEX} Syntax
-@end menu
-
 @node CREATE TABLE, ALTER TABLE, DROP DATABASE, Data Definition
 @subsection @code{CREATE TABLE} Syntax
 
@@ -34198,7 +34110,7 @@ mysql> SELECT * FROM articles WHERE MATCH (title,body) AGAINST (
 This query retrieved all the rows that contain the word @code{MySQL}
 (note: 50% threshold is gone), but does @strong{not} contain the word
 @code{YourSQL}.  Note, that it does not auto-magically sort rows in
-derceasing relevance order (the last row has the highest relevance,
+decreasing relevance order (the last row has the highest relevance,
 as it contains @code{MySQL} twice). Boolean fulltext search can also
 work even without @code{FULLTEXT} index, but it would be @strong{slow}.
 
@@ -34241,11 +34153,11 @@ find rows that contain at least one of these words.
 ... word ``apple'', but rank it higher if it also contain ``macintosh''
 @item +apple -macintosh
 ... word ``apple'' but not ``macintosh''
-@item +gates +(>hell <bill)
-... ``hell'' and ``gates'', or ``bill'' and ``gates'' (in any
-order), but rank ``gates to hell'' higher than ``bill gates''.
+@item +apple +(>pie <strudel)
+... ``apple'' and ``pie'', or ``apple'' and ``strudel'' (in any
+order), but rank ``apple pie'' higher than ``apple strudel''.
 @item apple*
-... ``apple'', ``apples'', ``applesause'', and ``applet''
+... ``apple'', ``apples'', ``applesauce'', and ``applet''
 @end table
 
 @menu
@@ -41422,14 +41334,6 @@ example.
 You can test for an error by calling @code{mysql_error()} or
 @code{mysql_errno()}.
 
-@cindex queries, C API results
-@menu
-* Query results::               What Results Can I Get From a Query?
-* Getting unique ID::           How Can I Get the Unique ID for the Last Inserted Row?
-* C API linking problems::      Problems Linking with the C API
-@end menu
-
-
 @node Query results, Getting unique ID, NULL mysql_store_result, C API problems
 @subsubsection What Results Can I Get From a Query?
 
diff --git a/Docs/mirrors.texi b/Docs/mirrors.texi
index 301ea20e41a..301ea20e41a 100755..100644
--- a/Docs/mirrors.texi
+++ b/Docs/mirrors.texi
diff --git a/myisam/mi_write.c b/myisam/mi_write.c
index 1dd4820bc03..d4a17ebf19b 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_write.c
@@ -815,7 +815,7 @@ int _mi_init_bulk_insert(MI_INFO *info)
     }
   }
 
-  if (!num_keys)
+  if (num_keys==0 || num_keys>myisam_bulk_insert_tree_size)
     return 0;
 
   info->bulk_insert=(TREE *)
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index bc3fb3f7cb7..5acec4ead67 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2934,7 +2934,7 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "max_write_lock_count",    (long*) &max_write_lock_count,
       ~0L, 1, ~0L, 0, 1 },
   { "myisam_bulk_insert_tree_size", (long*) &myisam_bulk_insert_tree_size,
-      8192*1024, 4, ~0L, 0, 1 },
+      8192*1024, 0, ~0L, 0, 1 },
   { "myisam_block_size", 	(long*) &opt_myisam_block_size,
       MI_KEY_BLOCK_LENGTH, MI_MIN_KEY_BLOCK_LENGTH, MI_MAX_KEY_BLOCK_LENGTH,
     0, MI_MIN_KEY_BLOCK_LENGTH },