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/gluh/MySQL/Merge/5.1-new


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

mysql-test/r/partition.result:
  results block for bug # 17631
mysql-test/t/partition.test:
  test block for bug #17631
sql/ha_partition.cc:
  move table_type func to .cc file and return table_type from
  the first handler.  This is acceptable since we know we have
  at least one handler and we currently do not support multiple
  engine types.  Later, we'll need to extend this to return
  some type of delimited list
sql/ha_partition.h:
  removed inline version of this function
sql/sql_show.cc:
  if the table is partitioned, we add the term "partitioned" to the 
  create options.  We make sure we are using the partitioned 
  handlerton before we do this.  When we support more native partition
  handlers then this will need to change.

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


storage/ndb/tools/Makefile.am:
  Auto merged

storage/ndb/tools/Makefile.am:
  Auto merged

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


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged

storage/ndb/tools/Makefile.am:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.1-merge

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Manual merge.

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/t/innodb.test:
  Manual merge: use local.

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged

sql/authors.h:
  Added myself.

into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv

mysql-test/t/csv.test:
  don't use "echo -n -e", as these flags are not supported
  by built-in "echo" commands found on many platforms.

Docs/Makefile.am:
  Include Windows manual in source package (if available), needed for CMake
  packaging.
Makefile.am:
  Include initial Windows database files in source package, needed for
  CMake packaging

  Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block


innobase/btr/btr0sea.c:
  Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block

No commit message

BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged

mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged

into  mysql.com:/home/my/mysql-5.1


storage/csv/ha_tina.cc:
  Auto merged

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


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged

into  xiphis.org:/home/antony/work2/p1-bug18464


configure.in:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/example/Makefile.am:
  Auto merged

out of a nested join to the on conditions for the nest.
The bug happened due to:
1. The function simplify_joins could change on expressions for nested joins.
   Yet modified on expressions were not saved in prep_on_expr.
2. On expressions were not restored for nested joins in 
   reinit_stmt_before_use.


mysql-test/r/join_nested.result:
  Added a test case for bug #18279.
mysql-test/t/join_nested.test:
  Added a test case for bug #18279.
sql/sql_prepare.cc:
  Fixed bug #18279.
  On expressions were not restored for nested joins in 
  reinit_stmt_before_use.
sql/sql_select.cc:
  Fixed bug #18279.
  The function simplify_joins could change on expressions for nested joins.
  Yet modified on expressions were not saved in prep_on_expr.

  Check that port range is valid, bug#16807


mysql-test/mysql-test-run.pl:
  Check that port range is valid, bug#16807

into  mysql.com:/home/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

  Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332


acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
scripts/mysqld_safe.sh:
  Added --help option, bug#16392

into  mysql.com:/home/my/mysql-5.1

into  mysql.com:/home/alexi/mysql-5.1-new