mysql-test/t/range.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.

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

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

into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0

  - Print the platform name for the build logs.


scripts/make_binary_distribution.sh:
  - Print the platform name for the build logs.

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


include/my_global.h:
  Auto merged

include/my_global.h:
  Add "&& defined(__GNUC__)"

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


include/my_global.h:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.h:
  Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.h:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/tztime.h:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-4.1-bg9913


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

  version-dependent information (which causes test failures when running the test with a
  different version string)


mysql-test/r/mysqldump.result:
  - fixed the results (removed the version-dependent comments to avoid a test failure)
mysql-test/t/mysqldump.test:
  - added "--skip-comments" to avoid printing comments that include version-dependent information
    (which causes test failures when running the test with a different version string)

mysql-test/r/mysqldump.result:
  Brian's modifications made on Ramil's laptop.
mysql-test/t/mysqldump.test:
  Brian's modifications made on Ramil's laptop.

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

sql/opt_range.cc:
  Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().
  Disable mix/max group by optimization for queries with rollup for now.
  Note: the actual bug was hidden; if this optimization works with rollup
  queries we will have to change some code:
  
  the problem is that we call the join->make_sum_func_list() function against 
  changed thd->mem_root (see SQL_SELECT::test_quick_select()) which creates some
  items for rollup, then we free that mem_root, then we try to reuse (free) those
  items.

client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
client/client_priv.h:
  c
  e
  ?
  h
mysql-test/t/mysqldump.test:
  Resolved conflict.

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

cmd-line-utils/libedit/Makefile.am:
  - added vis.h to the source distribution

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1

  - Remove vendor tag from package names.
  - Map standard OS names to user-friendly versions.


scripts/make_binary_distribution.sh:
  - Remove vendor tag from package names.
  - Map standard OS names to user-friendly versions.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).


sql/share/czech/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/danish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/dutch/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/english/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/estonian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/french/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/german/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/greek/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/hungarian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/italian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/japanese-sjis/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/korean/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/norwegian-ny/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/polish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/portuguese/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/romanian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/russian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/serbian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/slovak/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/spanish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/swedish/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
sql/share/ukrainian/errmsg.txt:
  Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1


BitKeeper/etc/logging_ok:
  auto-union

into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.


client/mysql.cc:
  Ensure that whitespace is inserted after C-style comment if required.

into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0


BitKeeper/etc/logging_ok:
  auto-union

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged