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

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


sql/sql_class.cc:
  Auto merged

into  dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351

  Update NDB version as well


configure.in:
  Update NDB version as well

  Stepped up to 4.1.22


configure.in:
  Stepped up to 4.1.22

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351

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

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

  Solaris sh don't like {..} in file matching


scripts/make_sharedlib_distribution.sh:
  Solaris sh don't like {..} in file matching

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

into mysql.com:/home/hf/work/mysql-4.1.clean

support-files/mysql.spec.sh:
  SCCS merged

  Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent

fixing an issue with the test portability.


mysql-test/t/mysqlbinlog.test:
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific
  encoding but rather set it via `set names'.

client/mysqldump.c:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - use list to store table names instead of hash.
mysql-test/r/mysqldump.result:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - test case.

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

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

 - A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact


include/my_pthread.h:
  Check return value from sigaction with a DBUG_ASSERT
  Also DBUG_ASSERT if signal number 0 is passed
sql/mysqld.cc:
  Don't call my_sigset if signo is 0

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

into  production.mysql.com:/usersnfs/tulin/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

    ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error

into  production.mysql.com:/usersnfs/tulin/mysql-4.1

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


mysql-test/t/disabled.def:
  SCCS merged

fixing encoding example because of table names can not be in koi8r 
on some platforms.


mysql-test/t/rpl_temporary.test:
  koi8r encoding to name tables is changed for latin1 for the former does not work
  on some platforms.
  The effect of the test remains: a test table is named to have multibyte utf8 representation,
  which is the essence of the bug.

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

- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd


ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb: added missing lock of mutex

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


support-files/mysql.spec.sh:
  Auto merged

ndb/test/ndbapi/Makefile.am:
  enable testInterpreter
ndb/test/ndbapi/testInterpreter.cpp:
  add test case Bug19537
  the bug fix also fixed IncValue64 for whatever reason..
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32

into  mysql.com:/home/alexi/innodb/mysql-4.1-ss29

- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid


ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/TransporterFacade.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_autodiscover3.result:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/t/ndb_autodiscover3.test:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
 


innobase/os/os0file.c:
  Applied innodb-4.1-ss29 snapshot.
   Check the page trailers also after writing to disk.
   This improves the chances of diagnosing Bug 18886.
   os_file_check_page_trailers(): New function for checking
   that two copies of the LSN stamped on the pages match.
   os_aio_simulated_handle(): Call os_file_check_page_trailers()
   before and after os_file_write().
sql/ha_innodb.cc:
  Applied innodb-4.1-ss29 snapshot.
   Increment statistic counter in ha_innobase::index_prev().

fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1


mysql-test/t/mysqlbinlog.test:
  fixing temp table name to fit to 64 bytes for 5.0
mysql-test/t/rpl_temporary.test:
  fixing temp table name to fit to 64 bytes for 5.0

mysqltest program should be really multithreaded to perform this
test with the embedded server. So this test disabled until we
redo mysqltest this way


mysql-test/t/init_connect.test:
  test can't work properly with the embedded server yet