into mysql.com:/home/gluh/MySQL/Merge/4.1

 disallow the use of comma in SET members

  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

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

  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

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)

  If CYBOZU defined, set character sets etc

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

  minor fixes in test programs

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

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

  Add per partition info (optionally to ndb_desc)

  Update makefile for removed files

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

  minor update to ndb-autotest.sh and config files

  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  timeslice DUMP(7015)

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

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

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

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

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

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

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

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.

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

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

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

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).

  (not possible from SQL in 4.1 & 5.0)