into  mysql.com:/usr/local/mysql/tmp-5.1


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
dbug/dbug.c:
  Manual merge
include/my_dbug.h:
  Manual merge

into  mysql.com:/usr/local/mysql/tmp-5.1


mysql-test/valgrind.supp:
  Manual merge.

into  mysql.com:/usr/local/mysql/tmp-5.1


sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sp_head.cc:
  SCCS merged

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss547
 Null merge


sql/ha_innodb.cc:
  Null merge
storage/innobase/os/os0file.c:
  Null merge

client/mysqlbinlog.cc:
  Now my_end() deallocates DBUG by default, but that fails in mysqlbinlog
  because of global destructors that use DBUG.
dbug/dbug.c:
  Add a facility to deallocate the debug stack, to avoid memory leak warnings
  in Valgrind.
include/my_dbug.h:
  Add a facility to deallocate the debug stack, to avoid memory leak warnings
  in Valgrind.
include/my_sys.h:
  Change my_end() to deallocate DBUG memory by default (can be disabled with
  MY_DONT_FREE_DBUG option).
libmysql/libmysql.c:
  Do not deallocate DBUG during cleanup.
mysys/my_init.c:
  Change my_end() to deallocate DBUG memory by default (can be disabled with
  MY_DONT_FREE_DBUG option).
sql/mysqld.cc:
  Add missing my_thread_end() call, seems to occasionally trigger a memory
  leak (not repeatable).

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
 Null merge


innobase/os/os0file.c:
  Null merge
sql/ha_innodb.cc:
  Null merge

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".


innobase/os/os0file.c:
  Applied innodb-5.0-ss547 snapshot.
   Check the page trailers also after writing to disk.
   This improves the chances of diagnosing Bug 18886.
   os_file_check_page_trailers(): New function for checking
   that two copies of the LSN stamped on the pages match.
   os_aio_simulated_handle(): Call os_file_check_page_trailers()
   before and after os_file_write().
sql/ha_innodb.cc:
  Applied innodb-5.0-ss547 snapshot.
   Increment statistic counter in ha_innobase::index_prev().

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
 


innobase/os/os0file.c:
  Applied innodb-4.1-ss29 snapshot.
   Check the page trailers also after writing to disk.
   This improves the chances of diagnosing Bug 18886.
   os_file_check_page_trailers(): New function for checking
   that two copies of the LSN stamped on the pages match.
   os_aio_simulated_handle(): Call os_file_check_page_trailers()
   before and after os_file_write().
sql/ha_innodb.cc:
  Applied innodb-4.1-ss29 snapshot.
   Increment statistic counter in ha_innobase::index_prev().

Added some suppressions needed for Valgrind on RHAS3 64-bit.

  
Stored procedure execution sometimes placed the address of auto variables
in the list of Item changes to undo in THD::rollback_item_tree_changes().
This could cause stack corruption.


sql/sp_head.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_head.h:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_rcontext.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_rcontext.h:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sql_class.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.

into  mysql.com:/home/psergey/mysql-5.1-merge2


mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/opt_range.cc:
  Manual merge

mysql-test/r/partition.result:
  fix results - bad automerge

into  xiphis.org:/home/acurtis/mysql-5.1-merge


sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new


BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Auto merged
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Auto merged

  Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test


BitKeeper/deleted/.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test
BitKeeper/deleted/.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
BitKeeper/deleted/.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
BitKeeper/deleted/.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
BitKeeper/deleted/.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
BitKeeper/deleted/.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
BitKeeper/deleted/.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
BitKeeper/deleted/.del-ndb_partition_range.result~17fc1db754d4153d:
  Delete: mysql-test/r/ndb_partition_range.result

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  Auto merged
mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010

mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars


mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Updated per lars
mysql-test/t/rpl_row_flsh_tbls.test:
  updated per lars
mysql-test/t/rpl_multi_engine.test:
  Updated per lars
mysql-test/t/rpl_row_basic_11bugs.test:
  Updated per lars

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_acl.cc:
  Auto merged

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win

regex is fixed for windows.


mysql-test/t/mysqldump.test:
  Windows' suffix is accounted.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

client/mysqlimport.c:
  Variable name changed mysql_connection -> mysql
include/violite.h:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
vio/viosslfactories.c:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1

into  mysql.com:/home/mysql-5.1-19509.19509

BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  mysql.com:/home/mysql-5.1-19509