into mysql.com:/space/my/mysql-4.0

 - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.

into hundin.mysql.fi:/home/heikki/mysql-4.0

  Fix buglets in previous push

into mysql.com:/home/mysql_src/mysql-4.0

  Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised

into mysql.com:/home/mysql_src/mysql-4.0

Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.

   use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)

 - tagged ChangeSet 1.1556 as mysql-4.0.15

Fix bug in SHOW GRANTS when there is a column privilege but no table privilege

into deer.(none):/home/hf/work/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0

i fixed this in 4.1 in slightly different way

just to make it compatible with the manual
(fixed bug #1056)

into mashka.mysql.fi:/home/my/mysql-4.0

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

Another fix applied

Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.

Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function

Fix make_win_src_distribution

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0

proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options)

Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.