into  mysql.com:/home/bk/b17400-mysql-5.1-new


sql/log_event.cc:
  Auto merged

Fixing bug where UPDATE failed on slave and some cleanup of ndb_unpack_record().


mysql-test/r/rpl_bit_npk.result:
  Result change
mysql-test/t/disabled.def:
  Disabling tests
mysql-test/t/rpl_bit_npk.test:
  Making test storage-engine independent
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
  Storage engine name change
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
  Storage engine name change
sql/ha_ndbcluster.cc:
  Using move_field_offset() to move field pointer.
  Using my_ptrdiff_t instead of uint for pointer difference.
  Removing ineffective cast.
  Calling member function directly, bypassing the virtual mechanism
  for Field_bit.
sql/log_event.cc:
  Starting and stopping range scan and index read inside find_and_fetch row
  instead of in calling function. There are storage engines that require the
  search to be restarted for every changed row.

unittest/examples/no_plan.t.c:
  Ensure that the "configure" result is used when compiling this module.
unittest/examples/skip_all.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/examples/todo.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/mytap/t/basic.t.c:
  Ensure that the configure result is used when compiling this module.

+ removed extra (not needed) discovery done at online create/drop index

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

into  mysql.com:/home/bk/fix-mysql-5.1-new

test rpl_err_ignoredtables.


sql/log_event.cc:
  Clearing tables to lock list in the event of errors.
  Adding asserts to catch failing to clear the list of tables to lock.
  Releasing allocated memory if the table will not be replicated.
sql/rpl_rli.h:
  Adding assert to ensure post-condition of clear_tables_to_lock().
  Minor rewrites.

libmysqld/Makefile.am:
  Another undetected typo ...

libmysqld/Makefile.am:
  Silly typo: Lacking a trailing semicolon after shell "if".

shell "for" loops without values to loop over cause syntax errors.


libmysqld/Makefile.am:
  Workaround:  The variable "$sqlstoragesources" expands to empty, this causes shell errors.
  The clean solution would be to check the reason for this, whether it will be permanent etc,
  but for a quick fix it is sufficient to prevent shell syntax errors.

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

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

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


storage/myisam/mi_check.c:
  Auto merged

- ndb system tables not created because of filter, moved chack of filter

into  mysql.com:/home/my/mysql-5.1


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

(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)


mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
  Added extra test + drop of table at end of test
mysql-test/lib/mtr_report.pl:
  Fail if mysqld asserts or prints stack
mysql-test/mysql-test-run.sh:
  Fail if mysqld asserts or prints stack
mysql-test/r/exampledb.result:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/r/innodb.result:
  Extra test to see that we can do an optimize table on an active transaction
mysql-test/r/rpl_failed_optimize.result:
  Added extra test + drop of table at end of test
mysql-test/t/exampledb.test:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/t/innodb.test:
  Extra test to see that we can do an optimize table on an active transaction
sql/handler.cc:
  Don't use row level logging on optimize or repair table.
sql/log.cc:
  Simplify code (no logic changes)
sql/mysql_priv.h:
  Added prototype
sql/sql_base.cc:
  Better name for define
sql/sql_class.cc:
  Indentation fix
sql/sql_parse.cc:
  Make end_active_trans() global
sql/sql_table.cc:
  Ensure we end active transcations if we do an admin command (like optimize, repair etc)

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

    fixed memleak in ndbcluster_end


mysql-test/mysql-test-run.pl:
  do not install ndb slave if no slaves
sql/ha_ndbcluster.cc:
  fixed memleak in ndbcluster_end

Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started

into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

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

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

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


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into  mysql.com:/home/my/mysql-5.1


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_lex.cc:
  manual merge

into  mysql.com:/home/my/mysql-5.1


sql/mysqld.cc:
  Auto merged