into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
BitKeeper/deleted/.del-group_concat_max_len_func.result:
  Delete: mysql-test/r/group_concat_max_len_func.result
BitKeeper/deleted/.del-group_concat_max_len_func.test:
  Delete: mysql-test/t/group_concat_max_len_func.test
BitKeeper/deleted/.del-max_allowed_packet_func.test:
  Delete: mysql-test/t/max_allowed_packet_func.test

BitKeeper/etc/ignore:
  Added mysql-test/r/max_allowed_packet_func.result to the ignore list

into  hh-nb.hungers:/work/merge/mysql-5.1-build-repogca


BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.result:
  Delete: mysql-test/r/query_cache_wlock_invalidate_func.result
BitKeeper/deleted/.del-timestamp_func.result:
  Delete: mysql-test/r/timestamp_func.result
BitKeeper/deleted/.del-innodb_table_locks_func.test:
  Delete: mysql-test/t/innodb_table_locks_func.test
BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.test:
  Delete: mysql-test/t/query_cache_wlock_invalidate_func.test
BitKeeper/deleted/.del-timestamp_func.test:
  Delete: mysql-test/t/timestamp_func.test

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

into  trift2.:/MySQL/M50/push-5.0

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


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

    Post-merge fix:  Add those files which are new in version 5.1

This is the 5.1 version of the fix for
   Bug #34291  compile-amd64-debug-max-no-ndb missing


BUILD/Makefile.am:
  Post-merge fix:  Add those files which are new in version 5.1

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


BUILD/Makefile.am:
  Auto merged

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


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

into  hh-nb.hungers:/work/merge/mysql-5.1-build


mysql-test/Makefile.am:
  Auto merged

mysql-test/Makefile.am:
  Fix for missing data files (bug#35988).

    
Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.

When merging this up, the "BUILD/compile-*" file list needs to be checked.


BUILD/Makefile.am:
  Fix for   Bug #34291  compile-amd64-debug-max-no-ndb missing
  
  Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
  which might be useful to community users who want to build from source.

into  hh-nb.hungers:/work/merge/mysql-5.1-build

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

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-build

	when --master-data is used

When using the --master-data option with mysqldump, mysqldump uses 
a FLUSH TABLES command.  However, this statement got replicated to 
the slave(s), which caused the slave(s) to block unnecessarily while
the FLUSH tables command completed.

Now, if the master-data option is set to one of the two "on" modes,
then use the "LOCAL" qualifier to ensure that it's not replicated.


client/mysqldump.c:
  If master_data is set to one of the two modes, then insert "LOCAL"
  to the command to FLUSH TABLES so that the slaves aren't told to 
  flush also.
mysql-test/r/mysqldump.result:
  Output of mysqldump changed.

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288


mysql-test/t/disabled.def:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge
sql/item_create.cc:
  manual merge

sql/field.cc:
  Fix indentation of new line.

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union

BitKeeper/etc/ignore:
  Added mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/windows_sys_vars.inc to the ignore list

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/item_create.cc:
  manual merge.
sql/share/errmsg.txt:
  manual merge.
sql/sql_yacc.yy:
  manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/sql_yacc.yy:
  merge by hand.