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

ndb/src/kernel/blocks/ERROR_codes.txt:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  do not crash on config mismatch if release compiled
ndb/test/ndbapi/testDict.cpp:
  do not crash on config mismatch if release compiled

  This test was moved into func_group.


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

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 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

  Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:


innobase/fil/fil0fil.c:
  Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
innobase/include/fil0fil.h:
  Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:

     .c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin



client/Makefile.am:
  fix for mysqladmin link problem
   .c -> .cc
client/mysqladmin.cc:
  fix for mysqladmin link problem
   .c -> .cc
configure.in:
  fix for mysqladmin link problem
   .c -> .cc
ndb/include/Makefile.am:
  fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
  fix type check problem

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

ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/common/debugger/EventLogger.cpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive

  row_ins_scan_sec_index_for_duplicate(),
  row_ins_duplicate_error_in_clust():
  remove unused variables "ptr"


innobase/row/row0ins.c:
  row_ins_scan_sec_index_for_duplicate(),
  row_ins_duplicate_error_in_clust():
  remove unused variables "ptr"

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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

clause resolves collation conflict for the
first and the second parts pair.

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


sql/ha_ndbcluster.cc:
  Auto merged

ndb/src/common/util/NdbSqlUtil.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbIndexOperation.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbOperationSearch.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbScanOperation.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)

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