into sunlight.local:/local_work/15560-bug-4.1-mysql

into  mysql.com:/home/my/mysql-4.1

Bug #17705 "FT Index corruption occurs with UTF8 data..."
(Actually, the bug had nothing to do with FT index but with general key compression)

  Check that port range is valid, bug#16807

  Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332

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

  Use "dist_bin_SCRIPTS" to get a script distributed

The GROUP_CONCAT uses its own temporary table. When ROLLUP is present
it creates the second copy of Item_func_group_concat. This copy receives the
same list of arguments that original group_concat does. When the copy is
set up the result_fields of functions from the argument list are reset to the
temporary table of this copy.
As a result of this action data from functions flow directly to the ROLLUP copy
and the original group_concat functions shows wrong result.
Since queries with COUNT(DISTINCT ...) use temporary tables to store
the results the COUNT function they are also affected by this bug.

The idea of the fix is to copy content of the result_field for the function
under GROUP_CONCAT/COUNT from  the first temporary table to the second one,
rather than setting result_field to point to the second temporary table.
To achieve this goal force_copy_fields flag is added to Item_func_group_concat
and Item_sum_count_distinct classes. This flag is initialized to 0 and set to 1
into the make_unique() member function of both classes.
To the TMP_TABLE_PARAM structure is modified to include the similar flag as
well.
The create_tmp_table() function passes that flag to create_tmp_field().
When the flag is set the create_tmp_field() function will set result_field
as a source field and will not reset that result field to newly created 
field for Item_func_result_field and its descendants. Due to this there
will be created copy func to copy data from old result_field to newly 
created field.

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.