into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.

  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE


innobase/fil/fil0fil.c:
  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()

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

corrected possible unalignment in NdbRecAttr access methods

into mysql.com:/home/timka/mysql/src/4.1-virgin

  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works


innobase/fil/fil0fil.c:
  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works

  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition


innobase/dict/dict0dict.c:
  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition

into mysql.com:/home/timka/mysql/src/4.1-dbg


sql/sql_show.cc:
  Auto merged

into hundin.mysql.fi:/home/heikki/mysql-4.1

SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo

  Make sure to ship error code in system error signal

into hundin.mysql.fi:/home/heikki/mysql-4.1

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

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

  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.

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

  release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read

  environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details

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

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

  Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.

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

  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.

  new file

into mysql.com:/dbdata/psergey/mysql-4.1-bug7885

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

(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff

ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers

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

This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.


include/keycache.h:
  Import patch 4285.diff
mysys/mf_keycache.c:
  Import patch 4285.diff
sql/mysql_priv.h:
  Import patch 4285.diff
sql/mysqld.cc:
  Import patch 4285.diff
sql/set_var.cc:
  Import patch 4285.diff
sql/sql_parse.cc:
  Import patch 4285.diff
sql/sql_show.cc:
  Import patch 4285.diff

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

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

  remove usage of compiler supplied <new> and instead
  impl. own inlined placement new


ndb/include/kernel/AttributeHeader.hpp:
  remove usage <new>
ndb/include/ndb_global.h.in:
  remove usage <new>
  instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
  remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
  remove usage <new>

  when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout

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