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

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  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  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

netware/BUILD/nwbootstrap:
  Editing "mwenv" is now obsolete,
  as this file gets its variable settings from the environment already;
  and it is even plain wrong,
  because the assignments to those variables are written in such a way that
  replacing the variables by values (as tried here) yields invalid shell lines.

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

  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.


sql/Makefile.am:
  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.

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


Docs/Makefile.am:
  Auto merged

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

into  rakia.gmz:/home/kgeorge/mysql/autopush/B24156-5.0-opt

           statements
Currently the optimizer evaluates loose index scan only for top-level SELECT
statements
Extend loose index scan applicability by :
 - Test the applicability of loose scan for each sub-select, instead of the
   whole query. This change enables loose index scan for sub-queries.
 - allow non-select statements with SELECT parts (like, e.g. 
   CREATE TABLE .. SELECT ...) to use loose index scan.


mysql-test/r/group_min_max.result:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
mysql-test/t/group_min_max.test:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - test case
sql/opt_range.cc:
  Bug#24156: Loose index scan not used with CREATE TABLE ...SELECT and similar
             statements
   - loose index scan will be tried over the current subselect 
     (lex->current_select) instead of the whole query (lex->select_lex).
   - allow non-select statements with SELECT parts (like, e.g. 
     CREATE TABLE .. SELECT ...) to use loose index scan.

into  rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt


mysql-test/r/func_gconcat.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_string.h:
  Auto merged

 When implicitly converting string fields to numbers the 
 string-to-number conversion error was not sent to the client.
 Added code to send the conversion error as warning.
 
 We also need to prevent generation of warnings from the places
 where val_xxx() methods are called for the sole purpose of updating
 the Item::null_value flag.
 To achieve that a special function is added (and called) : 
 update_null_value(). This function will set the no_errors flag and
 will call val_xxx(). The warning generation in Field_string::val_xxx()
 will use the flag when generating the conversion warnings. 


mysql-test/r/compare.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/func_gconcat.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/func_group.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - non-convertible strings in arithmetic operations
mysql-test/r/type_varchar.result:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - test case
mysql-test/t/type_varchar.test:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - test case
sql/field.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client
sql/item.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client
sql/item.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_func.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_subselect.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_sum.cc:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/item_sum.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - added a special function to explicitly update the null_value
sql/sql_string.h:
  BUG#11927: Warnings shown for CAST( chr as signed) but not (chr + 0)
   - send conversion warning to the client

into  trift2.:/MySQL/M50/push-5.0


extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged

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

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


sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-4.1-merge

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

  Reenabled build outside source tree


config/ac-macros/ha_berkeley.m4:
  Reenabled build outside source tree
config/ac-macros/ha_innodb.m4:
  Reenabled build outside source tree
config/ac-macros/ha_ndbcluster.m4:
  Reenabled build outside source tree
extra/yassl/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/benchmark/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/test/Makefile.am:
  Reenabled build outside source tree
extra/yassl/testsuite/Makefile.am:
  Reenabled build outside source tree
libmysql/Makefile.shared:
  Reenabled build outside source tree
ndb/src/mgmsrv/Makefile.am:
  Reenabled build outside source tree

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


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

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

  BSD compatibility


Docs/Makefile.am:
  BSD compatibility

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


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
bdb/dist/gen_rec.awk:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ndb/config/type_ndbapitools.mk.am:
  Auto merged
ndb/src/kernel/Makefile.am:
  Auto merged

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree