- to get cleaner error log in debug mode


storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove WAITFOR_RESPONSE_TIMEOUT printout

- revert bugfix, needs more work

- add ndb_share connect_count to decide if share can be reused to setup replication


sql/ha_ndbcluster.cc:
  add additional logging info
  remove inline real_free_share (not needed) and confuses valgrind printout
sql/ha_ndbcluster.h:
  add connect_count to ndb_share to enable checking for version of share
sql/ha_ndbcluster_binlog.cc:
  use ndb_share connect_count to decide if share can be reused to setup replication
  - share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
sql/ha_ndbcluster_binlog.h:
  remove inline real_free_share (not needed) and confuses valgrind printout

protect the setting of ndb_schema_share = NULL with a mutex


sql/ha_ndbcluster_binlog.cc:
  protect the setting of ndb_schema_share = NULL with a mutec

dbug/dbug.c:
  Build fix for sunfire100b. The ld does not want to link with an empty library, so we put something in it.
dbug/factorial.c:
  Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't use it even if we try, period.

temporary fix


libmysqld/lib_sql.cc:
  BUG#25895 compiling the server with embedded fails on several 64-bit platforms
  
  do not try to cast THD* to pthread_t, this operation is not possible

very temporary fix


libmysqld/lib_sql.cc:
  BUG#25890 mysqltest_embedded crashes on start
  
  temporary fix - initialize needed global variables

support-files/mysql.spec.sh:
  fix order in changelog

  Don't use -Wshadow by default yet


BUILD/SETUP.sh:
  Don't use -Wshadow by default yet

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel


mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue

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


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/myisam.result:
  Use local.
mysql-test/t/myisam.test:
  Use local.

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


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/r/myisam.result:
  Manually merged.
mysql-test/t/myisam.test:
  Manually merged.

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


mysql-test/t/myisam.test:
  Auto merged

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


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

into  chilla.local:/home/mydev/mysql-5.0-bug24607


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

into  chilla.local:/home/mydev/mysql-5.1-bug24607


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

into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/t/myisam.test:
  Auto merged
mysql-test/r/myisam.result:
  Manual merged

After merge fix

into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Manual merged
mysql-test/t/myisam.test:
  Manual merged

Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.


mysql-test/r/myisam.result:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Fixed test results.

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


sql/ha_ndbcluster.cc:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines


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

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines


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

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines

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

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work


storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged

ndb/src/common/util/SocketClient.cpp:
  fix two problems recently introduced:
  - HPUX build problem
  - some connect errors not being detected properly

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


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-4.1-bug24607


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