When doing an ALTER TABLE on a table using partitioning, force the table
  definition to get reloaded, since it may become invalid whenever the ALTER
  TABLE fails (even for an ALTER TABLE without specific partitioning changes).


mysql-test/r/partition.result:
  New results
mysql-test/t/partition.test:
  New regression test
sql/sql_partition.cc:
  Always force table to get reloaded when we ALTER a
  partitioned table

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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

  Changed product name from "Community Edition" to "Community Server", bug#17970


support-files/mysql.spec.sh:
  Changed product name from "Community Edition" to "Community Server", bug#17970

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

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

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

client/mysqltest.c:
  Add call to init_tmp_sh_file

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

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


mysql-test/t/disabled.def:
  Auto merged

  Transaction aborted on slave should be retries. The OPTION_BEGIN
  bit was cleared prematurely. Removed dependence of code on value
  of OPTION_BEGIN bit when executing retries.


mysql-test/r/rpl_ndb_basic.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test.
mysql-test/t/rpl_ndb_basic.test:
  Changing test to allow checking that slave did not stop.
sql/slave.cc:
  Rolling back transaction before retrying it.
  Only resetting transaction retries counter on a successful execution
  or a non-transitional error.

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


support-files/mysql.spec.sh:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

  NULL value handling


mysql-test/r/ndb_partition_error.result:
  Fix for bug#15447 Partitions: NULL is treated as zero
    test case
mysql-test/r/partition.result:
  Fix for bug#15447 Partitions: NULL is treated as zero
    test case
mysql-test/t/ndb_partition_error.test:
  Fix for bug#15447 Partitions: NULL is treated as zero
    test case
mysql-test/t/partition.test:
  Fix for bug#15447 Partitions: NULL is treated as zero
    test case
sql/partition_element.h:
  Fix for bug#15447 Partitions: NULL is treated as zero
    added null value flag to partition_element object
sql/partition_info.h:
  Fix for bug#15447 Partitions: NULL is treated as zero
    added null value flag to partition_info object
    added has_null partition id variable

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

- free ndb shares at server shutdown
- free_table_share at free of ndb_share

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


sql/table.cc:
  Auto merged

upgrade.result, upgrade.test:
  Adding test case.
table.cc:
  Don't try to open a table with old-formatted name,
  if the table name contains "@" character.
  This is to avoid mixing two different names to each other.
  Thanks Monty for suggesting this fix.


sql/table.cc:
  Bug#17142 Crash if create with encoded name
  Don't try to open a table with old-formatted name,
  if the table name contains "@" character.
  This is to avoid mixing two different names to each other.
mysql-test/t/upgrade.test:
  Adding test case.
mysql-test/r/upgrade.result:
  Adding test case.

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

  Some storage engines does not set the filler bits, so we set them
  before calling the record-reading functions.


sql/log_event.cc:
  Set the null byte containing filler bits before calling any record-
  reading functions.

client/mysqltest.c:
  Improve error messages for "inc" and "dec"
mysql-test/r/mysqltest.result:
  Update test result

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/mysql-test-run.sh:
  tests depend on umask

BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

client/mysqltest.c:
  Fix typo, add extra "s"

mysql-test/lib/mtr_misc.pl:
  Revert change to outpout exe path and name in win format

Reduce code


client/mysqltest.c:
  Remove the "cmd" variable in do_sleep, left unintentionaly after merge
  Implement the same elegeant solution to fund the command name in do_modify_ar

BitKeeper/etc/ignore:
  Added include/openssl to the ignore list

 - Use tmp sh file both in system and popen 


client/mysqltest.c:
  Introduce common functions to handle unix emulation on windows using a temporary sh file.
  Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Fix "windows paths" in three places that doesn't automatically get fixed
  Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
  Use system for util functions

Use system inestad of exec


mysql-test/t/trigger-grant.test:
  Use "system" instead of exec for system admin tasks
  No need to use "egrep", changing to "grep"

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new

mysql-test/t/kill.test:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

mysql-test/r/rpl_row_create_table.result:
  Update test results for "rpl_row_create_table" after push of fix for bug10460

mysql-test/r/rpl_row_UUID.result:
  Update test result for "rpl_row_UUID" after push of fix for bug10460

mysql-test/r/lowercase_table2.result:
  Update test result for "lowercase_tabe2" after push of fix for bug10460

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge. (use local)

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