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

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

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

#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

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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-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

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

  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

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

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

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

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

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

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

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).

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

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt

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

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

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

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

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

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