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

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

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

between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)

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

  Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

return error. We'll use it for better warnign reporting.

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

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

into mysql.com:/M41/mysql-4.1

  Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

into mysql.com:/M41/mysql-4.1

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

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

"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)

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

into mysql.com:/M41/mysql-4.1

  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

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

  fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.

when using --new" into 4.1 tree.

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

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