into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged

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


client/mysqltest.c:
  SCCS merged

into  shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217


client/mysqltest.c:
  Manual merge 4.1->5.0

 - Init start_lineno to 0


client/mysqltest.c:
  Init start_lineno to 0 and set it back to zero before comparing result file.

 - Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.


client/mysqlslap.c:
  Add loop to retry connect 10 times with a small sleep in between.
mysql-test/t/disabled.def:
  Remove disabling of testcase

mysql-test/t/ndb_autodiscover3.test:
  Increase time to sleep and add explanation why

 - Disable 3 test cases that crashes slave


mysql-test/t/disabled.def:
  Disable test cases where slave crashes due to bug#21298

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


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

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#14935 - post-review
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  bug#14935 - post-review
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#14935 - post-review

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

mysql-test/r/sp.result:
  Exclude
mysql-test/t/sp.test:
  Exclude

 - Add prelocking for stored procedures that uses sp or sf
 - Update test result for sp_error(reported as bug#21294)
 - Make note about new error message from sp-error(bug#17244)


mysql-test/r/sp-error.result:
  Update test result(reported as bug#21294)
mysql-test/r/sp_notembedded.result:
  Update test result after disabling test case
mysql-test/t/sp-error.test:
  Add note about the faulty error message
mysql-test/t/sp_notembedded.test:
  Disable test case until bug#17244 has been fixed
sql/sp.cc:
  Add prelocking for all stored procedures that uses another sp or sf
sql/sp.h:
  Add prelocking for all stored procedures that uses another sp or sf
sql/sql_base.cc:
  Add prelocking for all stored procedures that uses another sp or sf

mysql-test/mysql-test-run.pl:
  Report warining when failure to start mysqld was detected, this will allow the testcase to continue executing.
  The failure to start mysqld will be caugt when executing mysqltest

mysql-test/mysql-test-run.pl:
  Fix problem with checking that all im processes has shutdown cleanly
  When it was detected that one of "im mysqlds" didn't shutdown, last was called to break the loop, but it only broke the inner loop.
  Remove the while(0) loop and make this easier by setting $clean_shutdown to 0 if any such problem is detected.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


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

into  chilla.local:/home/mydev/mysql-5.1-amerge


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge

(well, im_options in this case, but using existing bug report)


mysql-test/t/disabled.def:
  disable im_options test as it's non-deterministic. reopen bug

into  willster.(none):/home/stewart/Documents/MySQL/5.1/main


BitKeeper/etc/config:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/Makefile.am:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge

Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error


mysql-test/r/ndb_dd_backuprestore.result:
  Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error
mysql-test/r/ndb_partition_range.result:
  Fixes for change that makes default appear in NODEGROUP as it should be instead of 0 which is an error

Test case fix


mysql-test/r/information_schema_part.result:
  Test case fix

into  dator5.(none):/home/pappa/bug20733


sql/sql_show.cc:
  Auto merged

into  dator5.(none):/home/pappa/bug20733

 - Disable test case until fixed


mysql-test/r/sp.result:
  Disable test case until bug#21039 is fixed
mysql-test/t/sp.test:
  Disable test case until bug#21039 is fixed

 - Only handle return codes from 'pclose' greater than zero as errors.
 - It appears pclose can return -1 with errno set to ECHILD although the executin
process completed successfully. 


client/mysqltest.c:
  Only handle return codes from 'pclose' greater than zero as errors.

mysql-test/t/rpl_insert.test:
  Wait after mysqlslap execution until all INSERT DELAYED operations has completed(i.e there are 5000 records in the table)

into  chilla.local:/home/mydev/mysql-5.1-amain


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Manual merge
include/my_sys.h:
  Manual merge
mysql-test/t/federated.test:
  Manual merge
sql/ha_federated.cc:
  Manual merge
tests/Makefile.am:
  Manual merge

After ndbd nodes has been restarted the mysqld's will enter "read only" mode until they are fully connected again. Wait in a loop until 
mysqld's has exited from that.

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-mrg


sql/ha_ndbcluster.cc:
  SCCS merged
sql/handler.h:
  SCCS merged
sql/sql_update.cc:
  SCCS merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  SCCS merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

 - Using CLIENT_MULTI_RESULTS is needed to execute stored procedures


client/mysqlslap.c:
  Use CLIENT_MULTI_RESULTS as connect_flags for all connections to the MySQL server.