into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/ha_federated.cc:
  Auto merged

into  macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt

  merge fix : removed undeterministic warnings


mysql-test/r/func_gconcat.result:
  merge fix : removed undeterministic warnings
mysql-test/r/func_group.result:
  merge fix : removed undeterministic warnings
mysql-test/t/func_gconcat.test:
  merge fix : removed undeterministic warnings
mysql-test/t/func_group.test:
  merge fix : removed undeterministic warnings

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

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


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

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

  disabled warnings because their order is undeterministic


mysql-test/t/func_gconcat.test:
  disabled warnings because their order is undeterministic
mysql-test/r/func_gconcat.result:
  disabled warnings because their order is undeterministic

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  chilla.local:/home/mydev/mysql-5.0-bug23139

  fixed test to replace port to SLAVE_PORT in result file
federated.result:
  new result file


mysql-test/t/federated.test:
  fixed test to replace port to SLAVE_PORT in result file
mysql-test/r/federated.result:
  new result file

into  chilla.local:/home/mydev/mysql-5.0-bug23139

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


sql/sql_yacc.yy:
  Auto merged

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

  Small fix for a test case


mysql-test/r/view_grant.result:
  Small fix for a test case

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


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

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


mysql-test/t/view_grant.test:
  Auto merged
sql/table.cc:
  Auto merged

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


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

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

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


sql/sql_base.cc:
  Auto merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge

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.


sql/sql_base.cc:
  Bug#20327: Marking of a wrong field leads to a wrong result on select with view, prepared statement and subquery.
  
  Now mark_select_range_as_dependent() function isn't called for fields from a
  view underlying table.
mysql-test/r/ps.result:
  Added a test case for bug#20327: Marking of a wrong field leads to a wrong result on select with view, prepared statement and subquery.
mysql-test/t/ps.test:
  Added a test case for bug#20327: Marking of a wrong field leads to a wrong result on select with view,prepared statement and subquery.

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

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


mysql-test/t/group_min_max.test:
  Auto merged
sql/opt_range.cc:
  Auto merged

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


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

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


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

mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

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


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge: use local.

into  mysql.com:/home/hf/work/thfix/my50-thfix

into  mysql.com:/home/hf/work/thfix/my50-thfix


client/mysqltest.c:
  Auto merged

the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.


client/mysqltest.c:
  it's used in embedded server only

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


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/wait_for_socket.sh:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.

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


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged