into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged

(recommit in clean clone)


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  removed unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always give all nodes in DIGETPRIMREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Allow readcommited-scans to scan backup fragments
ndb/test/ndbapi/testReadPerf.cpp:
  better printous

ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always supply all nodes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Enable scanning of backup fragments when read committed
ndb/test/ndbapi/testReadPerf.cpp:
  Better printout

into mysql.com:/home/jonas/src/wl2077


ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged

ndb/test/ndbapi/testScanPerf.cpp:
  Add reset_bounds option
  Impl. eq bound queries

into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  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:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged

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"


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

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

mysql-test/r/ctype_ucs.result:
  result update
mysql-test/t/ctype_ucs.test:
  time independent

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


mysql-test/r/ctype_ucs.result:
  result update
mysql-test/r/user_var.result:
  result update
mysql-test/t/ctype_ucs.test:
  importing test piece from user_var.test
mysql-test/t/user_var.test:
  using UCS2 in this test fails on non-USC2-capable binaries, so let's move this piece to ctype_ucs.test.
sql/slave.cc:
  changing arg type to uint32* (as what is used in this arg is &thd->db_length which is uint32*)
sql/slave.h:
  changing arg type to uint32*
sql/sql_parse.cc:
  changing arg types to uint32, as what is used in these args is a create_field::length which is uint32.

sql/ha_innodb.cc:
  Auto merged

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.


mysys/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.
mysql-test/t/key_cache.test:
  Added a test case for bug #6447.
mysql-test/r/key_cache.result:
  Added a test case for bug #6447.

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


sql/ha_innodb.cc:
  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

sql/item_func.cc:
  Fix comment (used_table_cache is completely different from 
  used_tables_cache :)

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


sql/ha_innodb.cc:
  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


sql/ha_innodb.cc:
  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


heap/hp_hash.c:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged

  reverting previous patch


sql/ha_ndbcluster.cc:
  reverting previous patch

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

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


strings/ctype-tis620.c:
  Space allocated didn't take in account trailing '\0' bytes.

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