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

and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure

    
    - support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds

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

BUG#10696

  adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.

into dl145b.mysql.com:/home/ndbdev/tomas/tmp

  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails

set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.

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

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

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

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

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

Fixed two deadlocks.
Made minor changes.

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

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

After merge fix.

into xiphis.org:/usr/home/antony/work2/p4-bug10413.2

Hand merged from 4.0.

  Stop ignoring name parts and check for validity

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:/space/my/mysql-4.1