in 5.0-community, but pulling to merge was very hard.


sql/mysql_priv.h:
  Add new extern "C" qualification to set_thd_proc_info().
  
  Fix typo in merge.
sql/mysqld.cc:
  Replace obselete gptr with uchar* .
  
  Add missing #endif from merge problem.
sql/set_var.cc:
  Include new parameter to user variable contruction.
sql/sql_cache.cc:
  Remove duplicate line from merge problem.
sql/sql_profile.cc:
  struct st_table_list is now typedef'd to a new name.
  
  ST_FIELD_INFO now includes a new member, a pointer to an open_table
  function.
sql/sql_profile.h:
  struct st_table_list is now typedef'd to a new name.

community-server features.

Community server features should be fully integrated into 5.1, but
disabled by default.  We never toggle that they're disabled based
on the version number, in the 5.1 line and later.


configure.in:
  Remove easily-changed and prominent variable that toggled
  community-server features.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1


client/mysqlcheck.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/sql_lex.h:
  SCCS merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

to get rid of a name clash among *deleted* files on case-insignificant file systems.


BitKeeper/deleted/.del-changelog-bleh:
  Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  after merge fix

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

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

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt

into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged

sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/30638/my51-30638

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging

into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt

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

sql/opt_range.cc:
  type conversion fixed

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

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

into  mysql.com:/home/hf/work/30638/my51-30638

into  mysql.com:/home/hf/work/30638/my51-30638


sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/opt_range.cc:
  merging
sql/sql_map.cc:
  merging
storage/federated/ha_federated.cc:
  merging
storage/heap/ha_heap.cc:
  merging

myisam/mi_write.c:
  type conversion fixed
myisam/sort.c:
  type conversion fixed
sql/ha_federated.cc:
  type conversion fixed
sql/ha_heap.cc:
  type conversion fixed
sql/ha_innodb.cc:
  type conversion fixed
sql/ha_myisam.cc:
  type conversion fixed
sql/opt_range.cc:
  type conversion fixed
sql/sql_map.cc:
  type conversion fixed
sql/sql_select.cc:
  type conversion fixed
sql/sql_update.cc:
  type conversion fixed

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt


mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_gis.result:
  merged 5.0-opt -> 5.1-opt
mysql-test/t/innodb_gis.test:
  merged 5.0-opt -> 5.1-opt
sql/field.cc:
  merged 5.0-opt -> 5.1-opt
sql/field.h:
  merged 5.0-opt -> 5.1-opt
sql/sql_select.h:
  merged 5.0-opt -> 5.1-opt
sql/sql_yacc.yy:
  merged 5.0-opt -> 5.1-opt
sql/table.cc:
  merged 5.0-opt -> 5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged