into  mysql.com:/home/marty/MySQL/mysql-5.1

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

  Corrected test case result

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

  Fixed failing test case

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

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

  Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"

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

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

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

into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql

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

into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql

  Fixed failing test case

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

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

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

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 serg.mylan:/usr/home/serg/Abk/mysql-5.1

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

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

1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.

  - fix for IM stopping routine;
  - polishing.

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

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.

  Fixed failing test case
field.cc, item_cmpfunc.cc, select.result:
  After merge fix

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