into  trift-lap.fambruehe:/MySQL/M50/push-5.0


Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
sql/item_subselect.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
  Manual merge: Use the standard text.

into  trift-lap.fambruehe:/MySQL/M50/push-5.0

into  trift-lap.fambruehe:/MySQL/M41/push-4.1

into  trift-lap.fambruehe:/MySQL/M50/push-5.0


configure.in:
  Auto merged
include/Makefile.am:
  Auto merged

mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.

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

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

ndb/test/ndbapi/testScanFilter.cpp:
  restrict to GPLv2

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


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged

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

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

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

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


include/my_global.h:
  Auto merged

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


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


mysql-test/r/grant.result:
  will be merged in a post-merge CS
mysql-test/t/grant.test:
  manual merge
sql/sql_parse.cc:
  manual merge

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

- Correct PushBuild failure.


win/Makefile.am:
  Bug#24732 Executables do not include Vista manifests
  - Make sure new files are included in make dist builds.

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.


BitKeeper/etc/ignore:
  Bug#24732 Executables do not include Vista manifests
  - Revise ignore rules to disallow auto-generated cmake files but to allow
  custom macros defined in a .cmake file.
CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.
win/create_manifest.js:
  Bug#24732 Executables do not include Vista manifests
  - Manifest generator.  This script generates a basic manifest.
win/mysql_manifest.cmake:
  Bug#24732 Executables do not include Vista manifests
  - Define new CMake MACRO for adding Windows manifests to executables.

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

  Fix minor merge "oopsie"


mysql-test/t/mysql_upgrade.test:
  Fix minor merge "oopsie"

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit
  - Make sure that connection handlers decrement number of threads
  and handlers on Windows.
  - Signal condition variable before unlocking mutex.

into  debian.(none):/M50/push-5.0

into  debian.(none):/M50/push-5.0

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


client/mysql.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Fix "make distcheck"


scripts/CMakeLists.txt:
  Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
  Add "name of struct" as first arg to comp_sql

                        in a build "--without-server".

Fix for bug#14685


dbug/dbug_analyze.c:
  In a build "--without-server", the libraries will be built without threading.
  In this case, "my_thread_global_init()" is missing in the libraries, and the 
  linker will report an unresolved symbol.
  
  Avoid this error by making the call to "my_thread_global_init()" depend on 
  "#ifdef THREAD".
  
  Fix for bug#14685

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


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

BitKeeper/deleted/.del-abi_check:
  Delete: include/abi_check

BitKeeper/deleted/.del-fix_priv_tabs.result:
  Delete: mysql-test/r/fix_priv_tabs.result