don't store keys in normalized form
instead save everythings as normal attributes               


ndb/src/kernel/blocks/backup/Backup.cpp:
  Remove special handling of keys, that was build to support
   tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/Backup.hpp:
  Remove special handling of keys, that was build to support
   tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Remove special handling of keys, that was build to support
   tables where keys was only stored in ACC
ndb/tools/restore/Restore.cpp:
  Remove special handling of keys, that was build to support
   tables where keys was only stored in ACC
ndb/tools/restore/Restore.hpp:
  Remove special handling of keys, that was build to support
   tables where keys was only stored in ACC

ndb/test/src/NDBT_Test.cpp:
  clear threads when finished waiting

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure to release all resources when aborting scan
    in state WAIT_AI_SCAN

mysql-test/r/ndb_charset.result:
  testcase for bug#6871
mysql-test/t/ndb_charset.test:
  testcase for bug#6871

  replace with charsets
  check update of primary key wo/ normalizing
  


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Make sure tXfrmFlag is false when checking for update of primary key

mysql-test/r/ndb_index_unique.result:
  Test of unique index and null
mysql-test/t/ndb_index_unique.test:
  Test of unique index and null
sql/ha_ndbcluster.cc:
  Fixed long overdue problems with unique indexes and null values

ndb/include/ndbapi/NdbScanOperation.hpp:
  Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
  new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
  Added two more scan tests
  Collapsed testTransactions & testOperations

ndb/test/ndbapi/testScanPerf.cpp:
  1) Fix so that values are read even when using -q
  2) Divide by correct number

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Scan number allocation must be on table even in case of range scan
  Otherwise scan takeover won't work as LQHKEYREQ contains table

Queue scan on real fragment.
  Index fragment for range scans
  Table fragment for table scans


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Document meaning of fragPtrI and how it differs
    from scanTcRec->fragmentptr
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Queue scan on real fragment.
    Index fragment for range scans
    Table fragment for table scans
ndb/src/ndbapi/NdbConnection.cpp:
  Check tOp before assigning

ndb/src/common/util/version.c:
  4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations)

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print on state on rare crash
ndb/test/run-test/daily-basic-tests.txt:
  more test cases

ndb/src/ndbapi/NdbScanOperation.cpp:
  1 more fix of premature scan closure

into mysql.com:/home/jonas/src/mysql-4.1-fix


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

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle already closed fragments
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Better handling of SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed some special cases by setting up them instead
ndb/test/src/NDBT_Test.cpp:
  Fix createTable(false)
ndb/tools/select_all.cpp:
  Use full scan as default

  (temporary)

(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/test/ndbapi/testScanPerf.cpp:
  Add reset_bounds option
  Impl. eq bound queries

  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

  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