into  debian.(none):/M51/merge-5.1


configure.in:
  Auto merged
include/config-win.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

```yaml
Added casts and fixed wrong type.
```

Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.


client/mysqltest.c:
  Added casts to avoid compiler warnings.
  ---
  Added casts to avoid compiler warnings.
mysql-test/lib/mtr_report.pl:
  Test run now fails if we have [Warning] and [ERROR] as tags in .err file
  Added list of all common 'not fatal' errors to ignore error list
  ---
  Give warnings also for safe_mutex errors
  Added some warnings from different machines in pushbuild
  ---
  Added escapes for double quotes and parenthesis.
  ---
  Added non-critical warnings to be ignored.
  ---
  Fixed a wrong regexp
  Added new non-critical warning
mysql-test/mysql-test-run-shell.sh:
  Fixed some wrong startup options
mysql-test/r/func_misc.result:
  Test case for archive db fix.
mysql-test/t/disabled.def:
  Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
mysql-test/t/func_misc.test:
  Test case for archive db fix.
mysys/array.c:
  Added casts to avoid compiler warnings.
mysys/hash.c:
  Added casts to avoid compiler warnings.
mysys/my_compress.c:
  Added casts to remove compiler warnings on windows
mysys/my_conio.c:
  To avoid a warning from compiler.
mysys/my_pread.c:
  Archive db fix.
mysys/my_quick.c:
  Added cast to avoid compiler warning.
  ---
  Added cast to avoid compiler warning.
sql/ha_ndbcluster_binlog.cc:
  Ensure we log all binglog errors with the "NDB Binlog" tag
sql/ha_partition.cc:
  result is type bool, so calculation should be forced to
  that also.
sql/log.cc:
  Fixed compiler problem on Solaris.
sql/slave.cc:
  Make errors uniform
sql/sql_class.cc:
  Added cast to remove compiler warnings on windows
sql/sql_map.cc:
  Added casts to avoid compiler warnings.
  ---
  Added casts to avoid compiler warnings.
sql/sql_plugin.cc:
  Fixed wrong type.
  ---
  Don't give warning that readonly variable is forced to be readonly
sql/stacktrace.c:
  Corrected manual reference
storage/archive/azio.c:
  Archive db fix.
  ---
  Fixed previously added patch.
storage/blackhole/ha_blackhole.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
storage/example/ha_example.cc:
  Fixed wrong prototype that caused test to fail on 64 bit platforms
strings/ctype-ucs2.c:
  Fixed wrong type.
  ---
  Fixed wrong type.
support-files/compiler_warnings.supp:
  Added new disabled warnings for Win 64.

CMakeLists.txt:
  Fix.

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

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-work


mysql-test/extra/binlog_tests/binlog.test:
  change not needed in 5.1
mysql-test/r/binlog_stm_binlog.result:
  change not needed in 5.1

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

mysql-test/r/binlog.result:
  transaction ids increased by one due to have_log_bin.inc
mysql-test/t/binlog.test:
  transaction ids for ps-protocol increased by one due to have_log_bin.inc

CMakeLists.txt:
  Fixed not matching if/endif (cmake)

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


mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged

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-work-nn


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  change not needed

mysql-test/t/mix_innodb_myisam_binlog.test:
  have_log_bin.inc increases transaction count by one, modify ps-protocol substitutions accordingly

after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled


mysql-test/extra/binlog_tests/blackhole.test:
  after-merge fix, not needed in 5.1
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  after-merge fix, not needed in 5.1
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  after-merge fix, not needed in 5.1
mysql-test/extra/binlog_tests/drop_temp_table.test:
  after-merge fix, not needed in 5.1
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  after-merge fix, not needed in 5.1
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  after-merge fix, not needed in 5.1

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


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

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.0-build-work-nn


mysql-test/t/blackhole.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged

mysql-test/t/ps.test:
  test requires binlog for now

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


mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  needs no change in 5.1 as it is in a separate folder
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  needs regeneration
mysql-test/t/mysqlbinlog-cp932.test:
  needs no change because already has dependency on binlog format
mysql-test/t/mysqlbinlog2.test:
  needs no change because already has dependency on binlog format

mysql-test/r/mix_innodb_myisam_binlog.result:
  have_log_bin.inc increases transaction count by onw
mysql-test/t/binlog.test:
  test obviously requires binlog
mysql-test/t/blackhole.test:
  test requires binlog for now
mysql-test/t/ctype_cp932_binlog.test:
  test requires binlog
mysql-test/t/ctype_cp932_notembedded.test:
  test requires binlog for now
mysql-test/t/ctype_ucs_binlog.test:
  test requires binlog
mysql-test/t/drop_temp_table.test:
  test requires binlog for now
mysql-test/t/flush_block_commit_notembedded.test:
  test requires binlog for now
mysql-test/t/insert_select-binlog.test:
  test requires binlog
mysql-test/t/mix_innodb_myisam_binlog.test:
  test requires binlog
mysql-test/t/mysqlbinlog-cp932.test:
  test requires binlog
mysql-test/t/mysqlbinlog.test:
  test requires binlog
mysql-test/t/mysqlbinlog2.test:
  test requires binlog
mysql-test/t/mysqltest.test:
  test requires binlog for now
mysql-test/t/sp_trans.test:
  test requires binlog for now
mysql-test/t/user_var-binlog.test:
  test requires binlog for now

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


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

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build


configure.in:
  Auto merged

  Added --with-mysqld-libs configure flag


configure.in:
  Added --with-mysqld-libs configure flag
sql/Makefile.am:
  Added --with-mysqld-libs configure flag

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


mysql-test/mysql-test-run.pl:
  Auto merged

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

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.1-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

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


BUILD/check-cpu:
  Auto merged

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


BUILD/check-cpu:
  Auto merged

BUILD/check-cpu:
  BUG#17707 add Turion (and Opteron)

  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory


plugin/daemon_example/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
plugin/fulltext/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
unittest/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
unittest/examples/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
unittest/mysys/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
unittest/mytap/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory
unittest/mytap/t/Makefile.am:
  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory

  After merge changes, removed unneeded Netware specific sprintf case


configure.in:
  After merge changes, removed unneeded Netware specific sprintf case

Fixed a bug that came in merge.


client/mysqltest.c:
  Changed accidently added tabs back into spaces.
mysys/array.c:
  Changed accidently added tabs back into spaces.
sql/set_var.cc:
  Changed accidently added tabs back into spaces.
sql/sql_insert.cc:
  Removed accidently included line in merge.
sql/sql_yacc.yy:
  Changed accidently added tabs back into spaces.

  Don't try determine stack direction at configure time
compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time


configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time
config/ac-macros/compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
config/ac-macros/misc.m4:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time
include/config-netware.h:
  Don't try determine stack direction at configure time
include/config-win.h:
  Don't try determine stack direction at configure time
sql/sql_parse.cc:
  Don't try determine stack direction at configure time

into  linux-th5m.site:/home/my/mysql-5.1-marvel


include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged