storage/ndb/src/ndbapi/NdbBlob.cpp:
  fix typo which made blob PART part of distribution key
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  fix typo which made blob PART part of distribution key

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

bug#24303  Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_cache.cc:
  Merge

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_update.result:
  Using local, will regenerate

#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

sql/sql_trigger.cc:
  Another post-merge fix: make TRIGGER privilege work again, after
  IF EXISTS refactoring.

mysql-test/r/func_str.result:
  Update results (a post-merge fix).

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_yacc.yy:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637


sql/sql_yacc.yy:
  Auto merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637


sql/sql_yacc.yy:
  Auto merged

bug#24303  Wrong result for UPDATE IGNORE for NDB table: Refinement, only read all fields for UPDATE IGNORE with pk (check if UPDATE command and pk in write_set)

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.1-build


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

into  mysql.com:/home/kent/bk/mysql-5.0-build

Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).


sql/sql_yacc.yy:
  Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
  which was reversed, and return valid value if we are in SP.

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_update.result:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged