into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

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

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487

  
  aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).

    Fix bug in event handling wrt early node shutdown

- post review changes

- make sure keys are copied correctly when varchar has 2 length bytes
- test case

into  recycle.(none):/src/mysql-5.0-maint

- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

 - Additional patch removing check for mysql_errno on already closed
   mysql1

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

  fix cpu peak in big clusters during unpack of config

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  recycle.(none):/src/mysql-5.0-maint

- Create space safe strings for system() calls in mysql_upgrade.exe

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50