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

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

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.

  merge error

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

  new file

  post-conflict-merge fix (duplicate comment)

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.

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

    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:

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

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

    no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
    aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
    removed all dependencies of LocalConfig, except for mgmapi internals
    enabled multiple management servrs to fetch data configurations from eachother

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

  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

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

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