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

clear connect flag before doing disconnect


ndb/src/common/transporter/Transporter.cpp:
  clear connect flag before doing disconnect

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


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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

you need to check in to find out another couple of typos


libmysql/libmysql.c:
  Typos in comments fixed.

libmysql/libmysql.c:
  Comments to mysql_stmt_bind_param(). A couple of typos in existing 
  comments fixed.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756

into mysql.com:/home/mydev/mysql-4.1-4100

  minor option description change.


sql/mysqld.cc:
  minor option description change.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Compensate for "extra" lqhkeyreqrec during index read (when IgnoreError)
ndb/src/mgmsrv/main.cpp:
  Read corrent local node id
ndb/tools/waiter.cpp:
  Yet another user of LocalConfig

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface

into mysql.com:/home/mydev/mysql-4.1-4100

Solved performance problems by fixing a typo, which prevented enabling of write buffer.


sql/ha_myisam.cc:
  bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
  Solved performance problems by fixing a typo, which prevented enabling of write buffer.
  Supplied no test case, as it required too much data to see the performance regression.

  Collation name fixes.


configure.in:
  Collation name fixes.

testTransaction -n *Scan*
testTimeout -n *


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Added DUMP for tc appl timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Send tckey conf if m_exec_flags is set
  Added dump for appl timeout
ndb/test/include/HugoOperations.hpp:
  Add scanRead
ndb/test/ndbapi/testTimeout.cpp:
  Reenable
ndb/test/ndbapi/testTransactions.cpp:
  Fix scan test cases
ndb/test/run-test/daily-basic-tests.txt:
  reenable timeout-tests
  added testTransaction -n Scan* testcases
ndb/test/src/HugoOperations.cpp:
  Fix scan
ndb/test/src/NDBT_Test.cpp:
  Drop table before test...(if createTable==true)

  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.


sql/mysqld.cc:
  Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.

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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

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

- Init _all_ of CREATE_TABLE_REF


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Init _all_ of CREATE_TABLE_REF

  get_options() did an exit(0) after reporting "Too many arguments"


sql/mysqld.cc:
  get_options() did a exit(0) when reporting "Too many arguments"

mysql-test/r/select_found.result:
  explain added
mysql-test/t/select_found.test:
  cleanup. 5000-char long line removed :)
sql/sql_select.cc:
  reverted

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

sql/sql_select.cc:
  typos in comments
  harmless (hopefully) bug in optimizer fixed

  Can't return value from void function


libmysql/libmysql.c:
  Can't return value from void function

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Operations with marker always leads to abort even
  if IgnoreError was supplied (limitation)
  
  Check marker before marking operation as aborted (which removes marker)
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init cnoOfAllocatedPages after returnCommonArea

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

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged

ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length

mysql-test/ndb/ndb_config_2_node.ini:
  Increase TimeBetweenWatchDogCheck to 30000

Added support of converion specifiers mentioned in manual but missing in code.


mysql-test/r/date_formats.result:
  Added tests of str_to_date() with new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
mysql-test/t/date_formats.test:
  Added tests of str_to_date() and new %T, %r and %V, %v conversion specifiers, and also 
  some other specifiers for which tests were missing previously.
sql/item_timefunc.cc:
  Added support for %T, %r, %V, %v, %X, %x conversion specifiers to extract_date_time()
  function. Also simplified a bit calculation of dates from week number.

into mysql.com:/home/kostja/mysql/mysql-4.1-root

the second is for the rest of time declarations in mysys.


include/my_time.h:
  New declarations moved from mysql_time.h
include/mysql_time.h:
  New declarations moved to my_time.h.
sql/tztime.cc:
  Enforcing Monty's approach to header files.
sql/tztime.h:
  Enforcing Monty's approach to header files: everything is included in
  one place.

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged