into  mysql.com:/home/stewart/Documents/MySQL/4.0/main

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

  they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way

remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked

- create a "mysql" user group and assign the mysql user account to that group
  in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
  Brazilian translations, more consequent use of macros)

Only reproducable in 5.1-wl2325, although the missing code is missing from 4.0 and up.

  all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script

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

  Enable build with CXX=gcc and gcc version 4

  "changed dl_name to udf->dl in mysql_create_function"

BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.

into mysql.com:/Users/mikron/bug10901

After review fix
Copy from internal state to share state only when in lock write
mode (happens only when lock table x write has been performed since
update_state_info is only called when holding a TL_READ_NO_INSERT
lock normally. Previous patch would have failed in combination with
delayed writes.

Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case

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

and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure

  Bug #11064  	some read error not detected in replication on 64-bit platform

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)

1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.

into mysql.com:/M40/mysql-4.0

Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)

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

when reporting an error, use an appropriate buffer for udf->name

into mysql.com:/home/psergey/mysql-4.0-bug10095

The problem: base_list::remove didn't modify base_list::last when removing 
the last list element.
The fix: If we remove the last element, find the element before it (by walking
from the beginning of the list) and set base_list::last accordingly.

The list gets corrupted in both 4.0 and 4.1. There are no visible problems in 
current 4.1 because current 4.1 doesn't call where_cond->fix_fields() after 
constant propagation step.

Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045)

Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236

  Remove obsolete section number. (Bug #10534)

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0

  Fix bug + include test case.
  Enable outfile tests.

  Incomplete ALTER TABLE breaks MERGE compatibility
  Fix implicit NOT NULL not set on ALTER of PK columns

into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0