into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged

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

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

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1

sql/ha_ndbcluster.cc:
  Only add the NDB-table to list of files if it can be discovered AND sucessfully created on disk. This will make susre that NDB$BLOB tables does not show up in SHOW TABLES

ndb/src/kernel/vm/Configuration.cpp:
  Correct error message, it should indicate that it was not possible to connect to ndb_mgmd

Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted.


sql/examples/ha_archive.cc:
  Cleanup from Bar's and Antony's code review. Meta file should not be system independent (so you can copy around the files as you like).
sql/examples/ha_archive.h:
  No longer bother with storing the working version of the data files. Its unimportant while there is only one format.

mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file


sql/mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file

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


BitKeeper/deleted/.del-ndb_subquery.result:
  Delete: mysql-test/r/ndb_subquery.result
BitKeeper/deleted/.del-ndb_subquery.test:
  Delete: mysql-test/t/ndb_subquery.test
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/atrt-mysql-test-run:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

  fix for compile error in gcc.3.4.4
  and run error in gcc3.3.2


ndb/src/ndbapi/NdbScanOperation.cpp:
  fix for compile error in gcc.3.4.4
  and run error in gcc3.3.2

ndb/test/run-test/atrt-mysql-test-run:
  ...

and testcases


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#5736, subqueries and not in
sql/ha_ndbcluster.cc:
  bug#5736, subqueries and not in

fix of changed clo to mysql-test-run


ndb/test/run-test/atrt-mysql-test-run:
  Fix options to mysql-test-run

subqueries with "not in" and ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) Fix handling of LQHKEYREF & IgnoreError & Index read
  2) Fix TCRELEASEREQ = ok if CS_ABORTING & AS_IDLE
  3) Give more info back in case of TCRELEASEREF
sql/ha_ndbcluster.cc:
  Rewrite index_read to give proper error codes back

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


sql/examples/ha_archive.cc:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-4.1-bf


sql/field.cc:
  Auto merged

introduced during implementation of TIMESTAMP columns, which are able 
to store NULLs (Unfortunately it is impossible to write test case for
this. Kudos to Holyfoot for noticing it!)


sql/field.cc:
  Field_timestamp::get_auto_set_type(): To preserve compatibility 
  with pre-4.1 we have to handle TIMESTAMP_OLD_FIELD columns properly. 
  (It is ok to handle them as TIMESTAMP_DNUN_FIELD since value of first
   such column should be set to current timestamp on both INSERT and UPDATE
   operations, and we don't call this method for rest of them).

into deer.(none):/home/hf/work/mysql-4.1.5730

  Fix typos in previous push


innobase/include/dict0mem.h:
  Fix typos in previous push

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

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

  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.


innobase/row/row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.
innobase/include/dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
sql/ha_innodb.cc:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok

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

into hundin.mysql.fi:/home/marko/j/mysql-4.1

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


sql/ha_ndbcluster.cc:
  Auto merged

into hundin.mysql.fi:/home/marko/j/mysql-4.1

mysql-test/r/ndb_index_ordered.result:
  test case
mysql-test/t/ndb_index_ordered.test:
  test case
ndb/include/kernel/signaldata/ScanTab.hpp:
  Split exclusive/keyinfo
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Add possibility retreive sorted flag
ndb/include/ndbapi/NdbOperation.hpp:
  Add possibility retreive lock mode
ndb/include/ndbapi/NdbResultSet.hpp:
  Add possibility to get operation
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Split exclusive/keyinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Keep theLockMode up-to-date
ndb/src/ndbapi/NdbScanOperation.cpp:
  Keep theLockMode up-to-date
sql/ha_ndbcluster.cc:
  Use NdbIndexScanOperation::reset_bounds when
    performing second index access

sql/examples/ha_archive.h:
  Updates for new meta file.
sql/examples/ha_archive.cc:
  Removed debug statement.

ndb/include/ndbapi/NdbConnection.hpp:
  Add support for removing op from list
ndb/include/ndbapi/NdbScanOperation.hpp:
  virtual destructor
ndb/src/ndbapi/NdbConnection.cpp:
  Add support for removing op from list
ndb/src/ndbapi/NdbScanOperation.cpp:
  Set magic number to invalid before first prepareSendScan
  (so that prepareSendScan is only called once incase of restarts)
ndb/src/ndbapi/Ndblist.cpp:
  Use correct type
ndb/test/src/UtilTransactions.cpp:
  Update test prg.
  - use LM_Read to maintain locks
  - set iop = null on temporary error (restart transaction)

removed staus flag