BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged

fixed bug: "create view v7 as select * from information_schema.tables;" failed


mysql-test/r/information_schema.result:
  changed field names, fields order according to WL description
mysql-test/t/information_schema.test:
  changed field names, fields order according to WL description
sql/sql_show.cc:
  changed field names, fields order according to WL description
sql/sql_view.cc:
  fixed bug: "create view v7 as select * from information_schema.tables;" failed
tests/client_test.c:
  changed field names, fields order according to WL description

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

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

into mysql.com:/home/cps/mysql/trees/mysql-4.1

  reverting linking ndbclisnt to mysqladmin.cc


client/mysqladmin.cc:
  reverting linking ndbclisnt to mysqladmin.cc
client/Makefile.am:
  reverting linking ndbclisnt to mysqladmin.cc

  reverting my last fix


acinclude.m4:
  reverting my last fix

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

    fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
    and simplified code a bit


ndb/src/kernel/vm/Configuration.cpp:
  corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
  and simplified code a bit

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/thread_repository.cc:
  Moved info declaration out of the loops to work around a compiler bug.

wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.


mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
sql/item_timefunc.cc:
  Manual merge

  This test was moved into func_group.


mysql-test/r/func_str.result:
  This test was moved into func_group.

properly" with main tree.


libmysql/libmysql.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.

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

Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.


mysql-test/r/func_group.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/r/func_str.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/t/func_group.test:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_func.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.h:
  Bug #6658 MAX(column) returns incorrect coercibility

into mysql.com:/home/dlenev/src/mysql-4.0-bg6439

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

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

the same queries.

strings/ctype-mb.c:
  Incorrect response with partial utf8 index:
  Fill the max string with max_sort_char up to res_length bytes.
strings/ctype-uca.c:
  Incorrect response with partial utf8 index.
  Typo fixes for UTF8 collations.

BitKeeper/etc/ignore:
  added ../ndb/tools/ndb_restore

  merge error


sql/ha_ndbcluster.cc:
  merge error

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  new file

  post-conflict-merge fix (duplicate comment)


sql/log_event.cc:
  post-conflict-merge fix (duplicate comment)

sql/log_event.cc:
  SCCS merged

When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.

sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

    corrected mistake in previous patch


ndb/tools/Makefile.am:
  change file name to avoid conflict
ndb/tools/restore/restore_main.cpp:
  corrected mistake in previous patch