of MySQL (BUG#3860)

  Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

   modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution

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

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

wrong results

(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.

into mysql.com:/home/pem/work/mysql-4.0

(cannot call it a "merge" :)

Abandoned improper use of MyISAM data.
Thanks Ingo!

  Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.

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

in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.

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

  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()

Removed improper casts.
Thanks to Joerg Bruehe for the fix.

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

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

replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().

SELECT ... UNION and INSERT ... SELECT ... UNION

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

  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) 

bug#4925

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

that was a forgotten '~' probably.

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

mysql outwits itself.