into  mysql.com:/home/bk/b18436-mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged

into  mysql.com:/home/bk/b18436-mysql-5.1-new

VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged

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

into  mysql.com:/home/bk/b18436-mysql-5.1-new

into  mysql.com:/home/timka/mysql/src/5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18659

- move slock bitmask to separate hash list, object living only during query


sql/ha_ndbcluster.h:
  Bug #18596 binlog schema event auto push causes mysqld errors

netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware

into  mysql.com:/home/bk/b18436-mysql-5.1-new

config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
libmysqld/lib_sql.cc:
  Temporary #ifdef to allow building from both bitkeeper sources and windows source package.
libmysqld/libmysqld.def:
  Add export missing for test_libmysqld
sql/cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
sql/mysqld.cc:
  #ifdef out code that is not used, nor compiles, in embedded server.
strings/cmakelists.txt:
  Add some missing sources to fix embedded server build.

scripts/mysql_install_db.sh:
  Auto merged

  Distribute mysql-test-run.pl


mysql-test/Makefile.am:
  Distribute mysql-test-run.pl

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged

  Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com

  Install Perl mysql-test-run into test directory


mysql-test/Makefile.am:
  Install Perl mysql-test-run into test directory

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.1-new

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520

sql/authors.h:
  One more little helper to the crew.

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  mysql.com:/home/alexi/innodb/mysql-5.1-merged

Results changed after the bug fix.

into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged

Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.


mysql-test/r/having.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/select.result:
  Added a test case for bug #16504.
mysql-test/r/subselect.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/varbinary.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/t/select.test:
  Added a test case for bug #16504.
sql/item.cc:
  Fixed bug #16504.
  An Item_equal object may contain only a constant member.
  It may happen after reading constant tables.
sql/item_cmpfunc.cc:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/item_cmpfunc.h:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/sql_select.cc:
  Fixed bug #16504.
  Adjusted multiple equalities after reading constant tables.
  Fixed a few typo in comments.