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  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

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.

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Mereg 5.0->5.1

mysql-test/lib/mtr_cases.pl:
  Allow --skip-test and --do-test to take a perl regex
mysql-test/mysql-test-run.pl:
  Update usage for --skip-test and --do-test

Our web server has been restructured several times, and references
to it in our source code has stayed the same.  This patch from Paul
DuBois updates all URLs to modern semantics.


debian/po/ca.po:
  Change URLs.
debian/po/cs.po:
  Change URLs.
debian/po/da.po:
  Change URLs.
debian/po/gl.po:
  Change URLs.
debian/po/ja.po:
  Change URLs.
debian/po/pt_BR.po:
  Change URLs.
debian/po/sv.po:
  Change URLs.
debian/po/tr.po:
  Change URLs.
mysql-test/lib/mtr_report.pl:
  Change URLs.
mysql-test/mysql-test-run-shell.sh:
  Change URLs.
ndb/include/ndbapi/Ndb.hpp:
  Change URLs.
netware/mysql_test_run.c:
  Change URLs.
scripts/mysqld_safe.sh:
  Change URLs.
sql/mysqld.cc:
  Change URLs.

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


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

mysql-test/mysql-test-run.pl:
  Just pass the $opt_valgrind_options to mtr_add_arg - it does a
  "push(@$args, sprintf($format, @fargs));" behind the scenes

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


client/mysqltest.c:
  Auto merged

Write .reject file to r/ if it's writable else use opt_logdir 


client/mysqltest.c:
  Write .reject file to r/ if it's writable else use opt_logdir

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


mysql-test/mysql-test-run.pl:
  Merge 5.0-> 5.1

 - "mysqld --verbose --help" need to be started in a writable directory 


mysql-test/mysql-test-run.pl:
  Create a tmpdir where mysqld can peform it's lowercase or uppercase test

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

 - Allow test case names to be specied in various different ways


mysql-test/lib/mtr_cases.pl:
  Allow test name to be specified in all sorts of ways:
  mysql-test-run alias
  mysql-test-run alias.test
  mysql-test-run main.alias
  mysql-test-run main.alias.test
  mysql-test-run t/alias
  mysql-test-run t/alias.test