Add -DDBUG_ON to CXXFLAGS whenever it is added to CFLAGS.
  Thus, sql/ha_innodb.cc will be compiled with the same
  setting of UNIV_DEBUG as the rest of InnoDB,
  i.e., --with-debug enables InnoDB ut_ad() assertions
  everywhere.

into hundin.mysql.fi:/home/marko/k/mysql-4.0

  Added a test case for bug #7672.
sql_yacc.yy:
  Fixed bug #7672.
  Made queries of the form (SELECT ...) ORDER BY ... to
  be equivalent to SELECT ... ORDER BY ...

  Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.

  environment (using "build" on SUSE Linux)

into mysql.com:/home/jimw/my/mysql-4.0-clean

into mysql.com:/home/dlenev/src/mysql-4.0-bg7884

macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".

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

set to a negative value. (Bug #7700)

  Mac OS X PKGs with Do-pkg

into mysql.com:/home/jimw/my/mysql-4.0-clean

it has been specified. (Bug #7347)

  Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables

into hundin.mysql.fi:/home/marko/k/mysql-4.0

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

reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)

case will be added to client_test in 4.1

open interface for setting the "delete-on-close" flag.

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

mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.

  Made the default --mail address to be <build@mysql.com>.

This happened only if my_write() couldn't write even one byte.
I cannot easily add a .test for this, but I tested by hand before and after the change.

   build (to make the test suite pass)

official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226)

  ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

into mysql.com:/home/dlenev/src/mysql-4.0-bg7297

the Epoch". (With after review fixes).

  Fix the previous bug fix: dropping a table with FOREIGN KEY checks running on it caused a cascade of failed drops while the foreign key check was waiting for a lock

  Fix bug: if we dropped a table where an INSERT was waiting for a lock to check a FOREIGN KEY constraint, then an assertion would fail in lock_reset_all_on_table(), since that operation assumes no waiting locks on the table or its records
row0mysql.c:
  Fix bug: InnoDB failed to drop a table in the background drop queue if the table was referenced by a foreign key constraint