If installed, search built in lib path first, bug#13158


scripts/mysql_config.sh:
  If installed, search built in lib path first, bug#13158

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  Install "ndb_size.pl" script and template, bug#18421


ndb/tools/Makefile.am:
  Install "ndb_size.pl" script and template, bug#18421

into  mysql.com:/usr/home/bar/mysql-4.1.b15098


sql/field.cc:
  Auto merged

  Remove Solaris -xc99=none C option as C++ compiler can't handle it


scripts/mysql_config.sh:
  Remove Solaris -xc99=none C option as C++ compiler can't handle it

  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322


scripts/mysql_config.sh:
  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

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

  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

  If CYBOZU defined, set character sets etc


include/config-win.h:
  If CYBOZU defined, set character sets etc

  remove bug#18385 from autotest as it only works on 2 node clusters


ndb/test/run-test/daily-basic-tests.txt:
  remove bug#18385 as it only works on 2 node clusters

  minor fixes in test programs


ndb/src/kernel/blocks/ERROR_codes.txt:
  Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix test program

into  mysql.com:/usr/home/bar/mysql-4.1.b15376


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1.b17374

  Add per partition info (optionally to ndb_desc)


ndb/tools/desc.cpp:
  Add per partition info (optionally to ndb_desc)

  Update makefile for removed files


ndb/test/run-test/Makefile.am:
  Update makefile for removed files

  some more ndb-autotest updates (previously uncommitted...but in use)


ndb/test/run-test/ndb-autotest.sh:
  More autotest updates

  minor update to ndb-autotest.sh and config files


ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-dl145a.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-ndbmaster.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-shark.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/ndb-autotest.sh:
  Add support for conf per host

  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove dumping of LCP info during NF
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug18414
ndb/test/ndbapi/testTimeout.cpp:
  Fix error code checking
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug18414

  timeslice DUMP(7015)


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  doc...
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  timeslice DUMP(7015)

  Partial system restart, can not try to start with higher GCI that own
  even if knowing about a higher number


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add new dump for setting time between gcp
ndb/include/kernel/signaldata/StartPerm.hpp:
  Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error insert
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix so that we don't try to restart to a too new GCI when doing a partial start
  Add new error code when this node later tries to join
ndb/test/include/NdbRestarter.hpp:
  Add new method for selecting random node
ndb/test/ndbapi/testSystemRestart.cpp:
  Add new testcase for bug#18385
ndb/test/run-test/daily-basic-tests.txt:
  Run test in daily-basic
ndb/test/src/NdbRestarter.cpp:
  Add new method for selecting random node

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

  remove debug prinout

  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
  Keep broadcast of TAKEOVER_TCCONF for online upgrade


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add clever dump for showing active operations
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade

  Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
  When getting 4012, set NeedAbort and ReleaseOnClose


ndb/src/ndbapi/NdbConnection.cpp:
  Use variable for WAITFOR_RESPONSE_TIMEOUT
ndb/src/ndbapi/Ndbif.cpp:
  Use variable timeout for waitfor, 
    when receiving 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/TransporterFacade.cpp:
  Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/src/ndbapi/TransporterFacade.hpp:
  Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/test/ndbapi/testTimeout.cpp:
  Add testcase for 4012
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for 4012

Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.


include/m_ctype.h:
  Making my_wildcmp_bin public instead of static
strings/ctype-bin.c:
  Making my_wildcmp_bin public instead of static
strings/ctype-czech.c:
  Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit
mysql-test/include/have_latin2_ch.inc:
  New BitKeeper file ``mysql-test/include/have_latin2_ch.inc''
mysql-test/r/ctype_latin2_ch.result:
  New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result''
mysql-test/r/have_latin2_ch.require:
  New BitKeeper file ``mysql-test/r/have_latin2_ch.require''
mysql-test/t/ctype_latin2_ch.test:
  New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''

table.cc:
  Fixing to use system_charset_info instead of default_charset_info.
  Crash happened because the "ctype" array is empty in UCS2,
  and thus cannot be used with my_isspace().
  The reason why UCS2 appeared in this context was because of
  of default_charset_info variable incorrectly substituted to my_isspace().
  As functions check_db_name(), check_table_name() and check_column_name()
  always get values in utf8, system_charset_info must be used instead.
ctype_ucs2_def.test, ctype_ucs2_def-master.opt, ctype_ucs2_def.result:
  new file


sql/table.cc:
  Bug#18004 Connecting crashes server when default charset is UCS2
  Use of default_charset_info was wrong.
  Functions check_db_name, check_table_name and check_column_name
  get values of system_charset_info character set (utf8).

  Activly abort transactions (that's affected) during NF
  This removes a lot of bugs that can occur otherwise is using
    high value for TransactionDeadLockTimout


ndb/include/kernel/signaldata/TcContinueB.hpp:
  New continueb for active transaction abort on nf
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add bitmask of participating nodes to transaction record
  Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Active transaction baortion

  dont't allow node to join cluster until all nodes has completed failure handling


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override.
  But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later)
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase for bug#16772
ndb/test/run-test/daily-basic-tests.txt:
  Run test in basic suite

to binlog too much.

When InnoDB has to rollback a transaction because the lock table has
filled up, it also needs to inform the upper layer that the transaction
was rolled back so that the cached transaction is not written to the
binary log.


sql/ha_innodb.cc:
  When InnoDB rolls back a transaction in HA_ERR_LOCK_TABLE_FULL, it
  needs to inform the upper layer to rollback the transaction also.

  8 repeated nr with table wo/ logging cause crash
  Dont create crashed replica for temporary tables


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Dont create crashed replica for temporary tables
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Dont create crashed replica for temporary tables

mysql-test/lib/mtr_timer.pl:
  Fix bug where ^C would trigger cleanup handler in both parent and
  timeout child processes, causing duplicated messages and potential
  conflicts.

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

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

    ndb crash if trigger record get to big, fix incorrect max size of trigger record


ndb/src/kernel/blocks/backup/Backup.cpp:
  Increase size of max trigger record

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

For "count(*) while index_column = value" an index read
is done. It consists of an index scan and retrieval of
each key.

For efficiency reasons the index scan stores the key in
the special buffer 'lastkey2' once only. At the first 
iteration it notes this fact with the flag 
HA_STATE_RNEXT_SAME in 'info->update'.

For efficiency reasons, the key retrieval for blobs
does not allocate a new buffer, but uses 'lastkey2'...

Now I clear the HA_STATE_RNEXT_SAME flag whenever the 
buffer has been polluted. In this case, the index scan
copies the key value again (and sets the flag again).


include/my_base.h:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Changed the comment for HA_STATE_RNEXT_SAME as a warning
  for future uses.
myisam/mi_delete.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_key.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_rnext_same.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removed trailing space and fixed a comment.
myisam/mi_unique.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_update.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
myisam/mi_write.c:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Removing the flag HA_STATE_RNEXT_SAME from info->update
  if info->lastkey2 was reused for another purpose than
  index scanning.
mysql-test/r/myisam.result:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Added test result.
mysql-test/t/myisam.test:
  Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
  Added test.

scripts/make_binary_distribution.sh:
  Auto merged

  (not possible from SQL in 4.1 & 5.0)


ndb/src/kernel/blocks/suma/Suma.hpp:
  fix incorrect union

  - Back porting of some changes in later releases
  - Corrected valgrind support
  - Removed work around for TZ needed in VisualStudio 6
  - Don't restart master to add special settings from "<testcase>-master.opt",
    if same settngs as running master, feature request in bug#12433
  - With --reorder, keep tests with same *-master.opt content together,
    to save even more master restarts


mysql-test/lib/mtr_misc.pl:
  Added functions to compare lists of options
mysql-test/lib/mtr_cases.pl:
  Removed special code for Windows as in VC6 we unset
  TZ to avoid library bug
mysql-test/mysql-test-run.pl:
  Handle pseudo option --timezone=<spec> that sets TZ

into  neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137