into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

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

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

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

  Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script

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

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

into  mysql.com:/home/ram/work/b27515/b27515.4.1

into  mysql.com:/home/ram/work/b27515/b27515.4.1

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

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

into  mysql.com:/home/ram/work/b27515/b27515.5.0

into  mysql.com:/home/ram/work/b27515/b27515.5.0

into  recycle.(none):/src/bug24732/my50-bug24732

- Correct PushBuild failure.

into  recycle.(none):/src/bug24732/my50-bug24732

- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41

  Fix minor merge "oopsie"

into  recycle.(none):/src/bug25621/my50-bug25621

- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.

In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM.

This fix changes the logic to increment the counter of matched rows in the following cases:
1. If the error returned from write_row() is zero.
2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds. 

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

Fix "make distcheck"

so the WEXITSTATUS macro can "fiddle" with it as it so pleases
 

to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.

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

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

into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge