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

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

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.

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.

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

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


sql/ha_innodb.cc:
  Null-merge
storage/innobase/btr/btr0sea.c:
  Null-merge

 Fixed BUG#15650: DELETE with LEFT JOIN crashes server
 with innodb_locks_unsafe_for_binlog.
 Fixed compilation problem with non-C99 compilers
 in btr0sea.c


innobase/btr/btr0sea.c:
  Applied innodb-5.0-ss398 snapshot.
   Fix compilation problem with non-C99 compilers.
sql/ha_innodb.cc:
  Applied innodb-5.0-ss398 snapshot.
   Remove assertion ut_error which crashes the mysqld
   server if it prints a warning about the adaptive latch.

into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/sql_partition.cc:
  Auto merged

into  linux.site:/home/reggie/work/mysql-5.1-bug17631


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

moved several functions from sql_partition to be member functions


sql/partition_info.h:
  move these funcs from sql_partition to this class
sql/sql_partition.cc:
  move these funcs from sql_partition to this class
sql/sql_table.cc:
  calling the member func now instead

into  mysql.com:/usr/home/bar/mysql-5.1-new

scripts/mysqld_safe.sh:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/cast.result:
  Auto merged
sql/field.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/opt_range.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged

 - Fix typo bug in SEL_ARG::is_singlepoint()
 - In set_up_range_analysis_info(), treat MEDIUMINT as enumerable type just like other integer types


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18025
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18025
sql/opt_range.cc:
  BUG#18025: Fix a typo bug in SEL_ARG::is_singlepoint()
sql/sql_partition.cc:
  BUG#18025: In set_up_range_analysis_info(), treat MEDIUMINT as enumerable type just like other integer types.

into  mysql.com:/home/timka/mysql/src/5.0-bug-16710


mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

The bug was due to a missed case in the detection of whether an index
can be used for loose scan. More precisely, the range optimizer chose
to use loose index scan for queries for which the condition(s) over
an index key part could not be pushed to the index together with the
loose scan.

As a result, loose index scan was selecting the first row in the
index with a given GROUP BY prefix, and was applying the WHERE
clause after that, while it should have inspected all rows with
the given prefix, and apply the WHERE clause to all of them.

The fix detects and skips such cases.


mysql-test/r/group_min_max.result:
  Added test for BUG#16710.
mysql-test/t/group_min_max.test:
  Added test for BUG#16710.
sql/item.cc:
  Added new method [Item | Item_field]::find_item_in_field_list_processor.
sql/item.h:
  Added new method [Item | Item_field]::find_item_in_field_list_processor.
sql/opt_range.cc:
  Handle the case when there is no MIN/MAX aggregate function, and a
  keypart of the index being considered, that is after the GROUP BY
  prefix, is used in the WHERE clause and the condition where it is
  used cannot be pushed to the index.
  If this is the case, we rule out this index.