mysql-test/t/rpl_row_basic_8partition.test:
  this test requires partitioning

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

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

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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

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  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  fix all valgrind warnings in t/ndb_dd (except replication related)


sql/ha_ndbcluster.cc:
  Fix memleak
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Fix valgrind warning
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix valgrind warning
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/ndberror.c:
  Fix valgrind warning

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


sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly
sql/ha_ndbcluster_binlog.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly

perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave...
- has been causing failed later tests e.g. rpl_ndb_trig004

  still some valgrind varnings


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  still some valgrind varnings

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

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


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

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

  5.0->5.1 merge


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

  4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  post merge fix

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


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

  fix correct frag count in Backup block


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Fix correct no of fragment records

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