into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax

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

  typo


sql/ha_ndbcluster.cc:
  typo

    move lockmode from scan operation to operation
    added read tuple with lock mode


ndb/include/ndbapi/NdbIndexOperation.hpp:
  added read tuple with lock mode
ndb/include/ndbapi/NdbOperation.hpp:
  move lockmode from scan operation to operation
ndb/include/ndbapi/NdbScanOperation.hpp:
  move lockmode from scan operation to operation
ndb/src/ndbapi/NdbIndexOperation.cpp:
  added read tuple with lock mode
ndb/src/ndbapi/NdbOperationDefine.cpp:
  added read tuple with lock mode
sql/ha_ndbcluster.cc:
  set correct lockmode in all reads...
  moved lockmode from scan operatoin to operation

  Make timer an option


mysql-test/mysql-test-run.sh:
  Make timer an option

into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

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

  Run client_test as a testcase
  new file
mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysqltest.c:
  Don't check errno from popen, may not be set


client/mysqltest.c:
  Don't check errno from popen, may not be set
tests/client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysql-test/mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
mysql-test/t/client_test.test:
  Run client_test as a testcase

call.


sql/item_cmpfunc.cc:
  Rename: Field::store_for_compare -> Field::can_be_compared_as_longlong

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

into mysql.com:/users/kboortz/daily/work/mysql-4.1-es


mysql-test/mysql-test-run.sh:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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


mysql-test/mysql-test-run.sh:
  Auto merged

Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts)

  Embarrassing typo


mysql-test/mysql-test-run.sh:
  Embarrassing typo

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

  Added timing output for each test case.
  Added --embedded-server option.
mysqltest.c:
  Added 'start_timer', 'end_timer' commands
Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
Many files:
  new file


client/Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
client/mysqltest.c:
  Added 'start_timer', 'end_timer' commands
mysql-test/mysql-test-run.sh:
  Added timing output for each test case.
  Added --embedded-server option.

    added some debug printouts
    some changes in ndbcluster_init to make start of mysqld first work


ndb/include/mgmcommon/ConfigRetriever.hpp:
  removed init on ConfigRetriever
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed init on ConfigRetriever
  added some debug printouts
ndb/src/kernel/vm/Configuration.cpp:
  removed init on ConfigRetriever
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  removed init on ConfigRetriever
  added sleep in retry
sql/ha_ndbcluster.cc:
  some changes in ndbcluster_init to make start of mysqld first work

into noter.intranet.mysql.r18.ru:/root/mysql-4.1


sql/field.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

sql/field.cc:
  comments added
sql/item.cc:
  comments added
  code made more clean

sql/examples/ha_archive.cc:
  Octane host was complaining about unused variable and second declaration of the Field_blob in write row.

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

(Until mysqltest will support replace_result and replace_column on metadata).


mysql-test/r/ps_1general.result:
  Disabled part of test behaving differently on different builds.
  (Until mysqltest will support replace_result and replace_column on metadata).
mysql-test/t/ps_1general.test:
  Disabled part of test behaving differently on different builds.
  (Until mysqltest will support replace_result and replace_column on metadata).

Make sure to not receive more that buffer can fit currently


ndb/src/common/transporter/TCP_Transporter.cpp:
  Make sure to not receive more that buffer can fit currently

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add more require's in VM_TRACE
  Fix release of invalid tables
  testDict -n InvalidTables

into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax

ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fix so that start backup can be blocking
ndb/test/run-test/daily-devel-tests.txt:
  Use atrt-testBackup (which setups env)

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

If embedded library gets empty string as a hostname it should use embedded connection


libmysqld/libmysqld.c:
  Check for empty string added

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

debug printouts


mysql-test/ndb/ndbcluster.sh:
  .
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added printout for where configuration is fetched
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/main.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.cpp:
  added printout for where configuration is fetched
ndb/src/kernel/vm/Configuration.hpp:
  added printout for where configuration is fetched
ndb/src/ndbapi/Ndb.cpp:
  debug printouts

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged

if possible"
        - many new test cases
        - more and improved comments
      New files: t/ps_7ndb.test       test suite for NDB tables
                 r/ps_7ndb.result     expected results
                 include/ps_conv.inc  conversion test cases
+ review comments and fixes.


mysql-test/include/ps_create.inc:
  Rename of t_many_col_types -> t9
mysql-test/include/ps_modify.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_modify1.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_query.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
  Cleanups and comments.
  New test cases (derived from client_test.c)
mysql-test/include/ps_renew.inc:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Rename: t_many_col_types -> t9
mysql-test/r/ps_1general.result:
  Results updated.
mysql-test/r/ps_2myisam.result:
  Resutls updated.
mysql-test/r/ps_3innodb.result:
  Results updated.
mysql-test/r/ps_4heap.result:
  Results updated.
mysql-test/r/ps_5merge.result:
  Results updated.
mysql-test/r/ps_6bdb.result:
  Results updated.
mysql-test/t/ps_1general.test:
  WL#1856 "Conversion of client_test.c tests cases to mysqltest if
   possible": new test cases added.
mysql-test/t/ps_2myisam.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) and 
  fulltext test case added.
mysql-test/t/ps_3innodb.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_4heap.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_5merge.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
  Call of file include/ps_conv.inc (with new test cases) added.
mysql-test/t/ps_6bdb.test:
  WL#1856 Conversion of client_test.c tests cases to mysqltest if possible.
  Call of file include/ps_conv.inc (with new test cases) added.

more bug fixes.


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DropIndex -
  1) return Invalid version 
  2) Mark as IS_DROPPING so that 2 simulatainious threads can't drop it
ndb/src/ndbapi/NdbDictionary.cpp:
  Changed listIndex from taking table name to taking table id
  (should be index version aswell)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  List indexes using id
  Fix log towards m_globalHash
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  List indexes using tableid (indexid)