into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

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


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

  make sure to remove LCP files aswell if specifying --initial


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Add removal of LCP/X directories

into  trift2.:/MySQL/M51/push-5.1


include/config-win.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  update dl145a config for autotest


storage/ndb/test/run-test/conf-dl145a.cnf:
  update dl145a config for autotest

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


mysql-test/ndb/ndb_config_1_node.ini:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

  using new config variable FragmentLogFileSize (4M - 1G)


mysql-test/ndb/ndb_config_1_node.ini:
  change log file size (test)
mysql-test/ndb/ndb_config_2_node.ini:
  change log file size (test)
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  add new confif parameter
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  make logfile size configurable
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  make logfile size configurable
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  make logfile size configurable
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  add new config variable
storage/ndb/src/ndbapi/ndberror.c:
  update error message

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged

storage/ndb/src/kernel/blocks/pgman.cpp:
  a) in one case pl_queue.remove(ptr) was not followed
  by state &= ~ Page_entry::ONQUEUE.
  
  b) when collecting initial hot entries have to remove
  from queue if somehow got there.
  
  b) is easy to get with large buffer cache (256M).
  a) or b) is probably cause of bug#20612.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqlslap.c:
  correct spelling

and, as a consequence, from binary packages.
This is necessary because of entry 28685 in the bugs DB.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged

If it has been defined (by "configure", in "include/my_config.h"),
then an "#undef" is needed to avoid a redefinition.

This is needed to prevent a compile error of the debug server on AIX.


mysys/mf_keycache.c:
  It may happen, that "include/my_config.h" already contains a
    #define inline ...
  as created by "configure" (this happens on AIX).
  In this case, an "#undef" is needed to avoid a compile error.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/rpl_loaddata.test:
  Use local.
mysql-test/r/rpl_loaddata.result:
  Use local.

mysql-test/r/rpl_loaddata.result:
  Update result.
mysql-test/t/rpl_loaddata.test:
  Fix a typo in the test file.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/sp.result:
  Use local

mysql-test/r/sp.result:
  Update results.
mysql-test/t/mysql.test:
  Fix a typo.
mysql-test/t/mysqltest.test:
  Fix a typo.
mysql-test/t/order_by.test:
  Fix a typo.
mysql-test/t/row.test:
  Remove an unsupported command.
mysql-test/t/sp.test:
  Fix a typo.
mysql-test/t/subselect3.test:
  Fix  mysqltest warnings - now it warns when sees some suspicious --
  comment

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


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

sql/sp.cc:
  Fix a warning "field precision should have type "int", 
  but argument 2 has type "size_t"

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqlbinlog.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_func.cc:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
strings/my_vsnprintf.c:
  Manual merge.

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

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  Manual merge