fix memory corruption in event-api
  maybe bug fix for 18621, 19154, 19172, 19174


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Make sure that nasty c++ features arent run on Gci_container as it's supposed to be POD!

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

- binlog thread should not wait for apply status share if binlog is not enabled

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


mysql-test/mysql-test-run.pl:
  Auto merged

Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.


extra/yassl/taocrypt/cmakelists.txt:
  Don't write anything about /GX or /EHsc as cmake will detect that and turn exception handling ON. Since it's off by default, that is what we want.

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

Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.


BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0:
  Delete: mysql-test/t/rpl_ndb_relay_space.test
BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18:
  Delete: mysql-test/r/rpl_ndb_relay_space.result

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

mysql-test/mysql-test-run.pl:
  Turn on test timing by default, but make it so it can be turned off with
  --notimer. Also clean up the mysql-test-run.pl usage information a little
  bit, and add --benchdir to it.

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


mysql-test/t/disabled.def:
  Auto merged

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

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

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


mysql-test/t/disabled.def:
  Auto merged

mysql-test/t/disabled.def:
  Disabling failing test.

crash of mysqld due to null tOp in
NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  tOp could be null, don't fiddle with it if it is.

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

This is not a bug. Enabling disabled test and adding comment.


mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Adding comment about test.
mysql-test/r/rpl_ndb_relay_space.result:
  Result change.
mysql-test/r/rpl_relay_space_innodb.result:
  Result change.
mysql-test/r/rpl_relay_space_myisam.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test

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

- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid

Fixed timeing problem by ignoring failures and results from first select after table definition change


mysql-test/r/ndb_alter_table2.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
mysql-test/r/ndb_alter_table_stm.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe

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


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new

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


mysys/my_access.c:
  Auto merged

ensure check_if_legal_table_name is also defined on unix

into  mysql.com:/usr/home/bar/mysql-5.1-new

  After merge fix.


mysys/my_access.c:
  After merge fix.

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

(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc


libmysqld/Makefile.am:
  Fix compiler failure (libmysqld.a was empty)
  Reason was that 'cd' did an echo that confused 'ar'
mysql-test/mysql-test-run.pl:
  Make the port number in a nice range
mysql-test/mysql-test-run.sh:
  Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
  Fix code that jimw broke in his last change
storage/example/ha_example.cc:
  Removed memory leak
  (example_done_func was not called)

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


storage/ndb/src/kernel/vm/Emulator.cpp:
  SCCS merged

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1