into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

This change isn't correct, and the correct one will be pulled in from another
repository.

into  hh-nb.hhunger:/work/merge/mysql-5.1-build

into  hh-nb.hhunger:/work/merge/mysql-5.1-32496

mode

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build

  Updated links to version 5.1 of the manual

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build

  Include "manual.chm" in source TAR if it exists

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  five.local.lan:/work/merge/mysql-5.1-build-31610

   Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.

Fixes the following bug:

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51

Fixes the following bugs:

- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'

  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.1-build