into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime

Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime

Sending several "KILL QUERY" statements to target a connection running
"SELECT SLEEP" could freeze the server.

The locking order in Item_func_sleep was wrong and this could lead to a
dead lock.

This patch solves the issue by resolving the locking order properly.

into  endora.local:/Users/davi/mysql/mysql-5.0-runtime

FLUSH TABLES WITH READ LOCK fails to properly detect write locked
tables when running under low priority updates.

The problem is that when trying to aspire a global read lock, the
reload_acl_and_cache() function fails to properly check if the thread
has a low priority write lock, which later my cause a server crash or
deadlock.

The solution is to simple check if the thread has any type of the
possible exclusive write locks.

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

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

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

   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  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime

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  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build

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

When the server was out of memory it crashed because of invalid memory access.

This patch adds detection for failed memory allocations and make the server
output a proper error message.

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

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

In the "spec" file for RPM builds, handle the debug server tests different from the standard server.

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M50/push-5.0

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl