into mysql.com:/home/my/mysql-4.1

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

no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).

into mysql.com:/home/my/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-bg10040

"'func_sapdb' fails on 64bit build hosts")

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

A fix of the original patch.
Correctly clear a bit from an enum value.

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

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

One more free_charset call added

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

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

into mysql.com:/home/mydev/mysql-4.1-bug7806

into mysql.com:/home/mydev/mysql-4.1-bug7806

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/home/psergey/mysql-4.1-bug9103

  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.

  while testing changes to the mysql-copyright scripts

Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.