implement limitation with only on logfile group, since SR is really buggy with several


mysql-test/r/ndb_dd_ddl.result:
  Test that only 1 logfile group can be created
mysql-test/r/ndb_dd_dump.result:
  Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_ddl.test:
  Test that only 1 logfile group can be created
mysql-test/t/ndb_dd_dump.test:
  Test that only 1 logfile group can be created
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
  New error code for "only one logfile group" limitation
storage/ndb/src/kernel/blocks/lgman.cpp:
  New error code for "only one logfile group" limitation
storage/ndb/src/ndbapi/ndberror.c:
  New error code for "only one logfile group" limitation

storage/ndb/src/kernel/blocks/lgman.cpp:
  Fix sync_lsn so that it uses correct logfile group
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Make NdbDictionary wait much longer than 2 minutes

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  merge

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


ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged

  (not possible from SQL in 4.1 & 5.0)


ndb/src/kernel/blocks/suma/Suma.hpp:
  fix incorrect union

  handle out of string buffer when creating triggers


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle out of string buffer memory, while creating triggers

  Make sure that senderData value in communiation with LQH does not get overwritten by incorrect union
  


storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Fix union, or otherwise values will be over written

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

into mysql.com:/home/hf/work/mysql-5.1.mrg

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

fixed test case from previous commit


mysql-test/r/ndb_lock.result:
  fixed result file form previous commit
sql/ha_ndbcluster.cc:
  cleanup of ndb invalidate dictionary cache
sql/ha_ndbcluster.h:
  cleanup of ndb invalidate dictionary cache

- only set table share version to 0 (zero) on global invalidation

into mysql.com:/home/hf/work/mysql-5.1.mrg


sql/item_sum.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574

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

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

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574

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


sql/log_event.cc:
  Auto merged

  Removed error on seeing table map event when slave is in SBR mode
  and switching temporarily to RBR mode to replicate the rows.


sql/log_event.cc:
  Settig binlog format to "row" on seeing a table map event.
  Resetting binlog format on error and seeing STMT_END_F.
sql/sql_class.h:
  Adding method to unconditially set binlog format to "row".
mysql-test/r/rpl_rbr_to_sbr.result:
  New BitKeeper file ``mysql-test/r/rpl_rbr_to_sbr.result''
mysql-test/t/rpl_rbr_to_sbr.test:
  New BitKeeper file ``mysql-test/t/rpl_rbr_to_sbr.test''

into  linux.site:/home/reggie/work/mysql-5.1


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
client/mysqltest.c:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


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

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574


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

 - Update for 5.1


mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install_slave
  Check if ndbcluster_install_slave failed after it's been called. continu with disabled slave cluster if  --force is used.

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Manual merge of bug#17574 from 5.0 -> 5.1

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

mysql-test/lib/mtr_cases.pl:
  Always set "ndb_test" if tets name contains ndb. 
  Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
  Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
  Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok

  Changed product name from "Community Edition" to "Community Server", bug#17970


support-files/mysql.spec.sh:
  Changed product name from "Community Edition" to "Community Server", bug#17970

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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

into  mysql.com:/home/bkroot/mysql-5.1-new

client/mysqltest.c:
  Add call to init_tmp_sh_file

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

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


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

  Transaction aborted on slave should be retries. The OPTION_BEGIN
  bit was cleared prematurely. Removed dependence of code on value
  of OPTION_BEGIN bit when executing retries.


mysql-test/r/rpl_ndb_basic.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test.
mysql-test/t/rpl_ndb_basic.test:
  Changing test to allow checking that slave did not stop.
sql/slave.cc:
  Rolling back transaction before retrying it.
  Only resetting transaction retries counter on a successful execution
  or a non-transitional error.