into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge


sql/mysqld.cc:
  Null-merge.

 Applied changes due Heikki Tuuri.


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

into  zim.(none):/home/brian/mysql/dep-5.1

mysql-test/t/disabled.def:
  Adding disabled test for bug

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


sql/log.cc:
  Auto merged

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

mysql-test/t/disabled.def:
  Updating for broken tests

into mysql.com:/M51/mysql-5.1

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
sql/log.cc:
  Auto merged

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1

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

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

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

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

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


sql/sql_cache.cc:
  SCCS merged
sql/sql_class.cc:
  SCCS merged
sql/sql_cursor.cc:
  SCCS merged

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

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


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

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


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


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

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

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged

into mysql.com:/M51/mysql-5.1

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  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
sql/sql_repl.cc:
  Auto merged
mysql-test/t/rpl_temporary.test:
  manual merge

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


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged

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

into  mysql.com:/home/mydev/mysql-5.1-aid


sql/item.cc:
  Auto merged

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

into  mysql.com:/home/mydev/mysql-5.1-aid

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

    no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
    comments clarified. everything local to a plugin was declared static


plugin/fulltext/configure.in:
  no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c:
  comments clarified. everything local to a plugin was declared static.

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


sql/opt_sum.cc:
  Auto merged

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