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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work

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

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp

into  mysql.com:/usr/local/mysql/mysql-5.0-tmp


mysql-test/mysql-test-run.pl:
  Manual merge

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868

 Applied changes due Heikki Tuuri.


sql/mysqld.cc:
  Set innodb_thread_concurrency default value to 8 (Bug#15868).
   Changes due to Heikki Tuuri.

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


libmysql/Makefile.shared:
  Auto merged

 - Grab the path from "configure --sysconfdir=<path>" and set it as
   the first place to look for my.cnf files
   Do this both in Makefiles for libmysql and mysys
 - Patch provided by Francesco Riosa. Thank you!


libmysql/Makefile.shared:
  Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
mysys/Makefile.am:
  Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
mysys/default.c:
  Use DEFAULT_SYSCONFDIR as first place to look for my.cnf file if "--sysconfdir=<path>" been specified as argument to configure

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

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

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

into  dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table

into  mysql.com:/home/alexi/bugs/mysql-5.0-15758

env variable name is fixed.




mysql-test/include/get_binlog_dump_thread_id.inc:
  Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
  results

into  mysql.com:/users/lthalmann/bk/mysql-5.0

The function agg_cmp_type in item_cmpfunc.cc neglected the fact that 
the first argument in a BETWEEN/IN predicate could be a field of a view.
As a result in the case when the retrieved table was hidden by a view 
over it and the arguments in the BETWEEN/IN predicates are of 
the date/time type the function did not perform conversion of 
the constant arguments to the same format as the first field argument.
If formats of the arguments differed it caused wrong a evaluation of
the predicates.


mysql-test/r/view.result:
  Added a test case for bug #16069.
mysql-test/t/view.test:
  Added a test case for bug #16069.

Removing the problematic line from include test file.


mysql-test/include/get_binlog_dump_thread_id.inc:
  replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
  results

into  dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table

into  rurik.mysql.com:/home/igor/mysql-5.0

 innobase_query_caching_of_table_permitted()".
 Applied the patch due to Heikki Tuuri.
 Also removed superfluous #ifdefs.


sql/sql_cache.cc:
  Applied the patch due to Heikki Tuuri.
   Query_cache::store_query(): Make InnoDB to release the adaptive
   hash index latch before MySQL acquires the query cache mutex.
sql/sql_class.cc:
  Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg).
sql/sql_cursor.cc:
  Removing superfluous #ifdefs (suggested by Sanja, also discussed with Serg).

into mysql.com:/M50/mtr-5.0

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table

  
     Idea of the fix is for master to send FD event with `created' as 0
     to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
     In a case of a connect by slave to the master after its crash temp tables have been already
     cleaned up so that slave can not keep `orphan' temp tables.


mysql-test/r/rpl_temporary.result:
  results
mysql-test/t/rpl_temporary.test:
  wait-free addon to check temp tables are ok after slave reconnect.
sql/sql_repl.cc:
  Storing zero for assigning to `created' of FD event on the reconnecting slave.
mysql-test/include/get_binlog_dump_thread_id.inc:
  mysqltest's preudo-macro to calculate $id master dump thread id

mysql-test/mysql-test-run.sh:
  Provide info about the options used for this run to any evaluation tool.

into  rurik.mysql.com:/home/igor/mysql-5.0

  fix mem leak (not during running of transactions, but a few bytes when shutting down)


ndb/src/ndbapi/NdbLinHash.hpp:
  Make sure that getNext(0) actually finds first element

  silent valgrind warnings 5.0, ndb_autodiscover


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  append 4 bytes of 0's to end of buffer to shut valgrind up

mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).