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

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  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

  Small fix for a test case

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

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

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

  merged 5.0 testcases

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  moonbone.local:/work/20327-bug-5.0-opt-mysql

prepared statement and subquery.

When a field of a view from an outer select is resolved the find_field_in_view
function creates an Item_direct_view_ref object that references the 
corresponding view underlying field. After that the view_ref is marked
as a dependent one. While resolving view underlying field it also get
marked as a dependent one due to current_select still points to the subselect.
Marking the view underlying field is wrong and lead to attaching conditions
to a wrong table and thus to the wrong result of the whole statement.

Now mark_select_range_as_dependent() function isn't called for fields from a 
view underlying table.

into  moonbone.local:/work/17254-bug-5.0-opt-mysql

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

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

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