into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb


mysql-test/r/ndb_update.result:
  Auto merged

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

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

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

into  mysql.com:/home/bk/MERGE/mysql-4.1-merge

into  may.pils.ru:/home/svoj/devel/bk/mysql-4.1-engines

  Add checking of REDO to earlier during SR
      so take-over of node can be performed
      if it can't be restarted using logs
      (which btw is really weird...as it _should_ be able to use logs of other node in node group)

  Otherwise cluster could be started and 1 fragment on one node could not have been restored
  Making the cluster inconsisten, VERY BAD


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Break-out methods which searches for REDO for a fragment, so it can be used earlier during SR
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add checking of REDO to earlier during SR
    so take-over of node can be performed
    if it can't be restarted using logs
    (which btw is really weird...as it _should_ be able to use logs of other node in node group)

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines

This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.


sql/ha_myisammrg.cc:
  Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
  This fixes problems when merge table and subtables have different number of keys.

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines

Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.


mysql-test/r/ndb_update.result:
  A test case for bug#21381.
mysql-test/t/ndb_update.test:
  A test case for bug#21381.
sql/sql_update.cc:
  For multi table update notify storage engine about UPDATE IGNORE
  as it is done in single table UPDATE.

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


include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

    Make sure checkKeepGci is also run on oldStoredReplicas
      to prevent keepgci to move backwards when crash node restarts


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure checkKeepGci is also run on oldStoredReplicas
    to prevent keepgci to move backwards when crash node restarts

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

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

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

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


sql/item_func.cc:
  Auto merged

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

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

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


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/item_func.cc:
  Auto merged

into  mockturtle.local:/home/dlenev/src/mysql-4.1-rt-merge


sql/sql_select.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro


include/m_ctype.h:
  Use macro ATTRIBUTE_FORMAT_FPTR on function pointer
include/my_global.h:
  Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
  This was available from gcc 3.1, so diable it before that

into  siva.hindu.god:/usr/home/tim/m/bk/41


scripts/mysqlhotcopy.sh:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/41

into  siva.hindu.god:/usr/home/tim/m/bk/40

When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
 - disable __attribute__ when using qcc


include/my_global.h:
  Disable __attribute__ when compiling with qcc

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


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

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


mysql-test/r/ctype_utf8.result:
  Manual merge
mysql-test/t/ctype_utf8.test:
  Manual merge

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/table.cc:
  Auto merged

into  rama.(none):/home/jimw/my/mysql-4.1-clean


include/my_global.h:
  Auto merged

include/my_global.h:
  Disable __attribute__ on g++ < 3.4. There are actually some forms of it that
  are supported, but rather than create more ATTRIBUTE_<foo> macros to handle
  them, it is easier to just disable them all. We will catch the compiler warnings
  with more recent versions of g++.

into  rama.(none):/home/jimw/my/mysql-4.1-clean

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint