into  gbichot3.local:/home/mysql_src/mysql-5.0

a too large value": the bug was that if MySQL generated a value for an
auto_increment column, based on auto_increment_* variables, and this value
was bigger than the column's max possible value, then that max possible
value was inserted (after issuing a warning). But this didn't honour
auto_increment_* variables (and so could cause conflicts in a master-master
replication where one master is supposed to generated only even numbers,
and the other only odd numbers), so now we "round down" this max possible
value to honour auto_increment_* variables, before inserting it.

auto_increment breaks binlog":
if slave's table had a higher auto_increment counter than master's (even
though all rows of the two tables were identical), then in some cases,
REPLACE and INSERT ON DUPLICATE KEY UPDATE failed to replicate
statement-based (it inserted different values on slave from on master).
write_record() contained a "thd->next_insert_id=0" to force an adjustment
of thd->next_insert_id after the update or replacement. But it is this
assigment introduced indeterminism of the statement on the slave, thus
the bug. For ON DUPLICATE, we replace that assignment by a call to
handler::adjust_next_insert_id_after_explicit_value() which is deterministic
(does not depend on slave table's autoinc counter). For REPLACE, this
assignment can simply be removed (as REPLACE can't insert a number larger
than thd->next_insert_id).
We also move a too early restore_auto_increment() down to when we really know
that we can restore the value.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/alik/MySQL/devel/5.0-tree-merged

into  mysql.com:/home/alik/MySQL/devel/5.0-rt

BUG#18036 - update of table joined to self reports table as crashed

Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0

  - fix for IM stopping routine;
  - polishing.

can be started several times; monitor interval must be > 2sec

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1

Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt

  Don't try copy non existing extra/{sql_state,mysqld_error}.h

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Include "sql_yacc.yy" for completeness (bug#20387)

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

  After merge fix

  Changes for Netware