Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt


scripts/make_win_src_distribution.sh:
  Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt

  Include "sql_yacc.yy" for completeness (bug#20387)


scripts/make_win_src_distribution.sh:
  Include "sql_yacc.yy" for completeness (bug#20387)
  Improved error handling
  Don't list all files packed with tar/zip unless debugging

  Delete: netware/mysql_install.def
Makefile.am:
  Removed obsolete "mysql_install.def"


netware/Makefile.am:
  Removed obsolete "mysql_install.def"
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
  Delete: netware/mysql_install.def

into  mysql.com:/usr/home/ram/work/4.1.b15558

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

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


sql/ha_ndbcluster.cc:
  Auto merged

- correction of backport error

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


sql/ha_ndbcluster.cc:
  Auto merged

- make sure to disable bulk insert when check for duplicate key is needed


mysql-test/r/ndb_loaddatalocal.result:
  New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''
mysql-test/t/ndb_loaddatalocal.test:
  New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''

support-files/mysql.server.sh:
  Ensure that some necessary / useful system services have been started already,
  when the MySQL server is started. 
  This fixes bug#18810 and bug#20118

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

corrupt
  - add infinite retry on drop table temporary error

into  mysql.com:/home/marty/MySQL/mysql-4.1

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

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

- always calculate max log level on node start
- send event subscribe uncond


ndb/src/mgmsrv/Services.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - always send log level update

into  mysql.com:/data0/mysqldev/my/mysql-4.1

into trift2.mysql.com:/M41/mysql-4.1


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

mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)


mysql-test/mysql-test-run.pl:
  Found when fixing bug#20303: The "usage()" function ignored the message it was given,
  so we got no real indication about the problem. Print it if one is given.

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

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - with signal sender the clock issuing the command and the revceiver of the events are not the same
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - make sure to actually send the update to ndb nodes, and wait for the reply
ndb/src/mgmsrv/Services.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - make sure to compute max every time for log level

Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked

mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"


mysql-test/mysql-test-run.pl:
  A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
  Due to the use of 'pass_through' in option processing this lone '--' will remain
  as an argument, it must be ignored explicitly.

into  mysql.com:/usr/home/ram/work/4.1.b6880

mysql-test/r/auto_increment.result:
  Fix for bug #6880: LAST_INSERT_ID() within a statement
    - test result
mysql-test/r/rpl_log.result:
  Fix for bug #6880: LAST_INSERT_ID() within a statement
    - test result
mysql-test/t/auto_increment.test:
  Fix for bug #6880: LAST_INSERT_ID() within a statement
    - test case
mysql-test/t/rpl_log.test:
  Fix for bug #6880: LAST_INSERT_ID() within a statement
    - test case
sql/item_func.cc:
  Fix for bug #6880: LAST_INSERT_ID() within a statement
    - return the first thd->last_insert_id set (within a query)

VC++Files/client/mysql.dsp:
  Fixed omission of mysys\my_conio.c.
VC++Files/client/mysql_ia64.dsp:
  Fixed omission of mysys\my_conio.c.
client/mysqldump.c:
  VS compiler does not accept variable declarations within blocks.
  Such a behaviour complies with the Standard C.

into  mysql.com:/usr/home/ram/work/4.1.b16546


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  merging
mysql-test/t/func_time.test:
  merging

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

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

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

  Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.


ndb/src/kernel/blocks/ERROR_codes.txt:
  error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  2 new error inserts
  7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
  7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  autotest

into  mysql.com:/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/mysql-4.1