heap/hp_create.c:
  Auto merged
sql/filesort.cc:
  Auto merged
mysql-test/r/heap.result:
  manual merging
mysql-test/t/heap.test:
  manual merging
sql/ha_heap.cc:
  manual merging

into hundin.mysql.fi:/home/marko/mysql-5.0

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

sql/filesort.cc:
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
  Should call ha_rnd_end() only if ha_rnd_init() was called.

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


support-files/mysql.server.sh:
  Auto merged

  "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)


Build-tools/Do-solaris-pkg:
  - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
    (thanks to Kent for the suggestion)

Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)


support-files/mysql.server.sh:
  - small improvement: use LSB functions to display startup success and failure, if available.
    Fall back to builtin functions otherwise.
  - joined two pieces of code performing the same functionality into one "wait_for_pid" function
  - added a "reload" function (LSB requirement)

into mysql.com:/space/pekka/ndb/version/my50

ndb/src/common/transporter/Transporter.cpp:
  missing return

at function level.


ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Avoid compilation error: On IRIX, variables declared within a loop control statement
  seem to have function scope. Either use different identifiers, or declare them
  at function level.

into mysql.com:/usr/home/ram/work/4.1.b8799

into mysql.com:/M50/mysql-5.0

  dict_load_table(): Remove unused label that was accidentally introduced
  in a 4.0->4.1->5.0 merge.


innobase/dict/dict0load.c:
  dict_load_table(): Remove unused label that was accidentally introduced
  in a 4.0->4.1->5.0 merge.

heap/hp_create.c:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
include/heap.h:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
sql/ha_heap.cc:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.

BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0flu.c:
  Manual merge
innobase/dict/dict0load.c:
  Manual merge: do not refuse to open ROW_FORMAT=COMPACT tables

into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/dict/dict0load.c:
  SCCS merged

into krsna.:/home/patg/test/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union

Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.


mysql-test/r/federated.result:
  new test results for error handling tests.
mysql-test/t/federated.test:
  new error handling tests
sql/ha_federated.cc:
  - check_foreign_data source added
  - table names now enclosed in '`' to allow for '%' or other characters
  - better error handling
  - mysql_init now checked to see if it returns true/false, error out if false (Georg)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user


innobase/buf/buf0flu.c:
  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

into mysql.com:/home/psergey/mysql-4.1-bug8510

into mysql.com:/home/psergey/mysql-5.0-bug8510


mysql-test/r/ansi.result:
  Auto merged
sql/set_var.cc:
  Auto merged

into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1

into snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1


BitKeeper/etc/logging_ok:
  auto-union

  Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/psergey/mysql-4.1-bug8510


sql/set_var.cc:
  Auto merged

Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.


mysql-test/r/count_distinct2.result:
  Test results fixed.
mysql-test/r/func_group.result:
  Updated.
mysql-test/r/sum_distinct.result:
  Updated.
mysql-test/t/func_group.test:
  Add a test for COUNT(DISTINCT) and true varchar and case-insensitive
  collation. The table in the test contains only two distinct values.
mysql-test/t/sum_distinct.test:
  Since now we support INSERT INTO t1 (a) SELECT a+1 FROM t1, shorten
  the test.
  Add a nominal test for AVG(DISTINCT)
sql/item_sum.cc:
  Implementation of cleaned up Item_sum_count_distinct.
  Fixed a bug with COUNT(DISTINCT) and new VARCHAR and collations.
  Fixed a bug wiht AVG(DISTINCT) and wrong number of output digits
  after decimal point.
sql/item_sum.h:
  Cleanup for Item_sum_count_distinct.
  Now if the list of distinct arguments doesn't contain a blob column,
  we always use Unique and merge-sort to find distinct values.
sql/sql_class.h:
  Added a short-cut to find number of elements in Unique if all elements fit
  into memory.

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  !bk-eb merged
mysql-test/t/join_outer.test:
  !bk-eb merged

    don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave


sql/log.cc:
  don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc:
  clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


sql/set_var.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged