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

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

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

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

Moving the part of user_var.test using UCS2 to ctype_ucs.test

into rurik.mysql.com:/home/igor/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.

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

  Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this

Manually ported this bug fix from 4.0: 
 Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master

  Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master

into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug

  reverting previous patch

into mysql.com:/usr/home/bar/mysql-4.1

  Space allocated didn't take in account trailing '\0' bytes.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449

Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user

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

  changed link order to fix linking problems