Review fixes


mysql-test/r/partition.result:
  Review fixes
mysql-test/t/partition.test:
  Review fixes
sql/sql_insert.cc:
  Fixed a bug

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


sql/ha_ndbcluster.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Review comments


mysql-test/t/partition.test:
  Changed procedure names ensured procedures were dropped
sql/ha_ndbcluster.h:
  Improved name of method
sql/ha_partition.h:
  Improved name of method
sql/handler.h:
  Improved name of method
  Removed deprecated constants
sql/item_sum.cc:
  Improved name of method
sql/sql_acl.cc:
  Improved name of method
sql/sql_insert.cc:
  Removed use of HA_WRITE_SKIP and introduced is_fatal_error instead
sql/sql_select.cc:
  Improved name of method
sql/sql_table.cc:
  Improved name of method
  Reintroduced dead code for future possible use
sql/sql_union.cc:
  Improved name of method
sql/sql_update.cc:
  Improved name of method

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

storage/ndb/test/run-test/daily-devel-tests.txt:
  test_event_merge

storage/ndb/test/ndbapi/test_event_merge.cpp:
  test multiple tables and getGCIEventOperations
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fix getGCIEventOperations when merge events is on
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  fix getGCIEventOperations when merge events is on

into  mysql.com:/usr/home/ram/work/mysql-5.1

mysql-test/extra/rpl_tests/rpl_log.test:
  Fix for bug #20601: rpl_ndb_log.test failure
    - replace insignificant columns to make tests repeatable
mysql-test/r/rpl_ndb_log.result:
  Fix for bug #20601: rpl_ndb_log.test failure
    - result adjusted
mysql-test/r/rpl_row_log.result:
  Fix for bug #20601: rpl_ndb_log.test failure
    - result adjusted
mysql-test/r/rpl_row_log_innodb.result:
  Fix for bug #20601: rpl_ndb_log.test failure
    - result adjusted

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
sql/sql_insert.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged

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

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

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

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


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_replace.result:
  Merge
sql/ha_ndbcluster.cc:
  Merge

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


storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

mysql-test/r/im_life_cycle.result:
  Fix manual merge.

into  mysql.com:/home/alik/MySQL/devel/5.1-merged

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


sql/sql_update.cc:
  Auto merged

sql/handler.h:
  Handle HA_ERR_FOUND_DUPP_KEY and HA_ERR_FOUND_DUPP_UNIQUE similarly
sql/item_sum.cc:
  fix
sql/sql_select.cc:
  fix

  Corrected test case result


mysql-test/r/rpl_ndb_log.result:
  Corrected test case result

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


storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

into moonbone.local:/work/tmp_merge-5.1-opt-mysql

  Fixed failing test case


mysql-test/r/rpl_ndb_log.result:
  Fixed failing test case

into  mysql.com:/home/alik/MySQL/devel/5.1-merged


BitKeeper/deleted/.del-im_life_cycle-im.opt:
  Delete: mysql-test/t/im_life_cycle-im.opt
BitKeeper/deleted/.del-im_utils-im.opt:
  Delete: mysql-test/t/im_utils-im.opt
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle-im.opt:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Manually merged.
mysql-test/r/insert.result:
  Manually merged.
mysql-test/t/im_daemon_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_life_cycle.imtest:
  Manually merged.
mysql-test/t/im_utils.imtest:
  Manually merged.
mysql-test/t/insert.test:
  Manually merged.
server-tools/instance-manager/guardian.cc:
  Manually merged.
server-tools/instance-manager/manager.cc:
  Manually merged.
sql/sql_insert.cc:
  Manually merged.

- add error message

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

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/myisam.test:
  Manual merge.

  Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"


support-files/mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
scripts/make_win_src_distribution.sh:
  Removed reference to missing "tools" directory

sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
storage/ndb/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BUILD/compile-dist:
  SCCS merged
netware/Makefile.am:
  SCCS merged
netware/BUILD/compile-netware-END:
  SCCS merged

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


storage/ndb/include/util/ConfigValues.hpp:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  manual merge (n/a in 5.1)

ndb/src/mgmsrv/MgmtSrvr.cpp:
  user correct pointer

mysql-test/r/ndb_dd_dump.result:
  fix test result