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


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

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_alter_table2.test:
  Auto merged
mysql-test/t/ndb_alter_table3.test:
  Auto merged
mysql-test/t/ndb_autodiscover3.test:
  Auto merged
mysql-test/t/ndb_binlog_log_bin.test:
  Auto merged
mysql-test/t/ndb_binlog_multi.test:
  Auto merged
mysql-test/t/ndb_cache_multi.test:
  Auto merged
mysql-test/t/ndb_cache_multi2.test:
  Auto merged
mysql-test/t/ndb_single_user.test:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

Test that we can start a MySQL Server with a default multibyte charset with
NDB running. Test *really* basic functionality too.

Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
===================================================================


mysql-test/r/rpl_ndb_ctype_ucs2_def.result:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset
mysql-test/t/rpl_ndb_ctype_ucs2_def.test:
  Test for BUG#27404 util thd mysql_parse sig11 when default multibyte charset

NDB util thread calls mysql_parse internally with plain old c strings (7bit ascii) to create tables (e.g. mysql.ndb_schema). With mysqld default charset set to a multibyte one (e.g. ucs2) mysql_parse would try to interpret the 7bit string as UCS2 and promptly explode in a heap.

Solution is to set the util thread to be using utf8 charset.

Index: ndb-work/sql/ha_ndbcluster.cc
===================================================================


sql/ha_ndbcluster.cc:
  BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_28991

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


mysql-test/r/rpl_ndb_stm_innodb.result:
  Auto merged
mysql-test/t/rpl_ndb_stm_innodb.test:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

- wrong results checked in

- enabling test, duplicate bug, other bug fixed

- only log statements locally (changes will not be logged on other servers)


mysql-test/r/ndb_binlog_format.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_format.result''
mysql-test/t/ndb_binlog_format.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_format.test''

- binlog should always run if opt_bin_log is set

- correct includes

- undoing disable of ndb tests

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge

This patch contains enhancements to the rpl_events test to correct
timing issues related to the firing of events and verification of the
results of those events. 


mysql-test/include/rpl_events.inc:
  BUG#28991 : rpl_events failure in pushbuild 
  
  This patch contains refinements to the rpl_events test to remove all
  timing issues related to sleep commands. It also refines the test to
  include additional documentation.
mysql-test/r/rpl_events.result:
  BUG#28991 : rpl_events failure in pushbuild 
  
  This patch contains the result file for the refinements to the 
  rpl_events test.

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

    Add better handling of GCP Stop
    Only kill "offending" node


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  add new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add better GCP stop handling
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add better GCP stop handling

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge

  Fix 3 problems in REDO validation that could(will) lead to "Error while reading REDO log"


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add new state
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  fix bugs + add debugging

storage/ndb/src/kernel/blocks/pgman.cpp:
  another missing pgman stack pruning related to drop_page

into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ucs2_def.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_ucs2_def.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28925


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ctype_ucs2_def.result:
  After merge fix
mysql-test/t/ctype_ucs2_def.test:
  After merge fix

Problem: separator was not converted to the result character set,
so the result was a mixture of two different character sets,
which was especially bad for UCS2.
Fix: convert separator to the result character set.


mysql-test/r/ctype_ucs.result:
  Adding test case
mysql-test/r/ctype_ucs2_def.result:
  Adding test case
mysql-test/t/ctype_ucs.test:
  Adding test case
mysql-test/t/ctype_ucs2_def.test:
  Adding test case
sql/item_sum.cc:
  Adding conversion of separator to the result character set
sql/sql_yacc.yy:
  Fixing GROUPC_CONCAT problems when "mysqld --default-character-set=ucs2".

storage/innobase/handler/ha_innodb.cc:
  Using DBUG_RETURN() instead of normal return.

Removing dead code.


storage/innobase/handler/ha_innodb.cc:
  Removing dead code.

into  kindahl-laptop.dnsalias.net:/home/bk/b28722-mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl


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

Test fixes resulting from changed semantics.


mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  Using same engine throughout to prevent NDB tests from failing.
mysql-test/r/binlog_multi_engine.result:
  Result change.
mysql-test/r/ndb_read_multi_range.result:
  Result change.
mysql-test/r/ndb_trigger.result:
  Result change.
mysql-test/r/rpl_ndb_UUID.result:
  Result change.
mysql-test/r/rpl_row_UUID.result:
  Result change.
mysql-test/t/binlog_multi_engine.test:
  Removing garbage.
mysql-test/t/ndb_read_multi_range.test:
  Using ndbcluster for table used inside trigger.
mysql-test/t/ndb_trigger.test:
  Using ndbcluster for table used inside trigger.

Minor fixes to get proper detection of transaction isolation level when
inside external_lock().


mysql-test/t/disabled.def:
  Enabling innodb.test again.
mysql-test/t/innodb.test:
  Fixing some error codes. Test currently requires MIXED or ROW mode since
  READ-COMMITTED and READ-UNCOMMITTED are not safe for STATEMENT mode, i.e.,
  when the binary log is enabled.
storage/innobase/handler/ha_innodb.cc:
  Using tx_isolation since trx->isolation_level is not defined when
  inside external_lock().