into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_class.cc:
  Auto merged

Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.


sql/sql_class.cc:
  It is possible that mark_transaction_to_rollback() may be
  called in rare circumstances when thd is NULL (e.g., from
  some calls to convert_error_code_to_mysql()).  Don't use thd
  if it is NULL.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  mysql.com:/home/ram/work/b29444/b29444.5.1

client/mysqltest.c:
  Use correct data type for dummy variable passed to dirname_part()

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/ram/work/mysql-5.1-maint

into  mysql.com:/home/ram/work/mysql-5.1-maint


mysql-test/r/grant.result:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge.
mysql-test/t/type_datetime.test:
  manual merge.

as PS protocol gives slightly different metadata.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/mysqld.cc:
  Use local (null merge)
sql/set_var.cc:
  Use local (null merge)
storage/innobase/handler/ha_innodb.cc:
  Use local (null merge)
storage/innobase/handler/ha_innodb.h:
  Use local (null merge)

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

Problem: creating a partitioned table during name resolution for the 
partition function we search for column names in all parts of the
CREATE TABLE query. It is superfluous (and wrong) sometimes.

Fix: launch name resolution for the partition function against
the table we're creating.


mysql-test/r/partition.result:
  Fix for bug #29444: crash with partition refering to table in create-select
    - test result.
mysql-test/t/partition.test:
  Fix for bug #29444: crash with partition refering to table in create-select
    - test result.
sql/item.cc:
  Fix for bug #29444: crash with partition refering to table in create-select
    - LEX::use_only_table_context introduced, which is used in the 
      Item_field::fix_fields() to resolve names only against
      context->first_name_resolution_table/last_name_resolution_table.
sql/sql_lex.cc:
  Fix for bug #29444: crash with partition refering to table in create-select
    - LEX::use_only_table_context introduced, which is used in the 
      Item_field::fix_fields() to resolve names only against
      context->first_name_resolution_table/last_name_resolution_table.
sql/sql_lex.h:
  Fix for bug #29444: crash with partition refering to table in create-select
    - LEX::use_only_table_context introduced, which is used in the 
      Item_field::fix_fields() to resolve names only against
      context->first_name_resolution_table/last_name_resolution_table.
sql/sql_partition.cc:
  Fix for bug #29444: crash with partition refering to table in create-select
    - set the lex->use_only_table_context before the func_expr->fix_fields()
      call to ensure we're resolving names against the table we're creating;
      then restore it back after the call.

into  mysql.com:/home/ram/work/b31438/b31438.5.1

into  mysql.com:/home/ram/work/b31249/b31249.5.0


mysql-test/r/type_datetime.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge

into  mysql.com:/home/ram/work/b31438/b31438.5.1

into  mysql.com:/home/ram/work/b31249/b31249.5.1


sql/item_timefunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge.
mysql-test/t/type_datetime.test:
  manual merge.

bitmap_is_set(table->write_set, fiel

Problem: creating a temporary table we allocate the group buffer if needed
followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
the group buffer than actually needed (used) for values retrieval may lead 
to overlapping with followed bitmaps in the memory pool that in turn leads 
to unpredictable consequences.

As we use Item->max_length sometimes to calculate group buffer size,
it must be set to proper value. In this particular case 
Item_datetime_typecast::max_length is too small.

Another problem is that we use max_length to calculate the group buffer
key length for items represented as DATE/TIME fields which is superfluous.

Fix: set Item_datetime_typecast::max_length properly,
accurately calculate the group buffer key length for items 
represented as DATE/TIME fields in the buffer.


mysql-test/r/type_datetime.result:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test result.
mysql-test/t/type_datetime.test:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - test case.
sql/item_timefunc.h:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - set Item_datetime_typecast::max_length properly.
sql/sql_select.cc:
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
    - the group buffer key length for items represented as 
  DATE/TIME fields in the buffer should be calculated using
  the maximum pack length of such fields (== 8), using 
  max_length here is redundant.

into  alf.(none):/src/bug28774/my50-bug28774

into  alf.(none):/src/bug28774/my51-bug28774

into  alf.(none):/src/bug28774/my51-bug28774


client/mysql_upgrade.c:
  Auto merged

doesn't clean them up
- Make sure to cleanup temporary files after use.


client/mysql_upgrade.c:
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Close file handle and delete temporary file when write fails.

into  alf.(none):/src/bug28535/my51-bug28535


client/mysqldump.c:
  Auto merged

- Fixed error message.


client/mysqldump.c:
  Bug#28535 mistake in mysqldump error message
  - Corrected parameter order.

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


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
scripts/mysqld_safe.sh:
  Manual merge.

Problem: check missed if the second updatexml() argument is valid.

Fix: check it.


mysql-test/r/xml.result:
  Fix for bug #31438: updatexml still crashes
    - test result.
mysql-test/t/xml.test:
  Fix for bug #31438: updatexml still crashes
    - test case.
sql/item_xmlfunc.cc:
  Fix for bug #31438: updatexml still crashes
    - check if the second argument passed to the updatexml() is valid.

into  sin.intern.azundris.com:/home/tnurnberg/31253/51-31253

into  sin.intern.azundris.com:/home/tnurnberg/31253/50-31253

after-merge fixies


mysql-test/r/type_datetime.result:
  adjust to 5.1 warning message

into  sin.intern.azundris.com:/home/tnurnberg/19828/50-19828


mysql-test/r/grant.result:
  Auto merged

into  sin.intern.azundris.com:/home/tnurnberg/19828/51-19828

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
extra/comp_err.c:
  Auto merged
mysys/my_init.c:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

extra/comp_err.c:
  Override my_mkdir() umask setting. The default is 0700 which perfectly 
  makes sense for the server but leads to Bug #27789 when applied to comp_err
  generated directories in the souce tree. Generated directories and the
  files within won't be accessible to other users, sometimes including root 
  if on a non-local filesystem, making "sudo make install" fail.