into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/delayed.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged

Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.

Disabled the test case.

Disabled test case.

Disabled test case.

Disabled test case.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0

Disabled test case

Another try to fix a compiler warning on win64.

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

The initialization to zero via LINT_INIT made mysql.test fail.
print_warnings() was suppressed where it should not.

Fixed initialization so that it fakes warnings.


client/mysql.cc:
  Bug#32661 - Compiler warning in client/mysql.cc
  Fixed initialization so that it fakes warnings.

Re-enabled test case after fix

The test case fails on "vanilla" and "no_innodb" builds.
These builds do not include InnoDB.
The test case requires InnoDB.

Added requirement for InnoDB into the test case, so that
it does not start on those builds.


mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
  Bug#32668 - rpl_row_charset_innodb.test fails
  Added requirement for InnoDB.

Disabled test case

Disabled test case

Disabled the test case

Disabled test case

Disabled test case

Compiler warned about possible use of uninitialized variable
'warnings' in com_go().

Added LINT_INIT for 'warnings'.


client/mysql.cc:
  Bug#32661 - Compiler warning in client/mysql.cc
  Added LINT_INIT for 'warnings'.

Disabled test case

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/disabled.def:
  Manual merge from 5.0
storage/myisam/mi_packrec.c:
  Manual merge from 5.0

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

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


mysql-test/r/func_set.result:
  Auto merged
sql/item_cmpfunc.cc:
  SCCS merged

Problem: INTERVAL function implementation doesn't handle NULL range values.

Fix: skip NULL ranges looking for a proper one.


mysql-test/r/func_set.result:
  Fix for bug #32560: crash with interval function and count(*)
    - test result.
mysql-test/t/func_set.test:
  Fix for bug #32560: crash with interval function and count(*)
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #32560: crash with interval function and count(*)
    - skip NULL ranges calculating INTERVAL(...).

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled test case

Disabled test case

Fixed a compiler warning on win64. Backport from 5.1.

Fixed a compiler warning on win64

Disabled test case

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

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


mysql-test/r/olap.result:
  Auto merged
sql/item_func.h:
  Auto merged

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

into  stella.local:/home2/mydev/mysql-5.1-axmrg

            corrupts a MERGE table

Post-pushbuild fix. The merge test failed on Windows.
The MoveFile() function returned the error code
ERROR_ACCESS_DENIED.

The fix is to use a different name for the file to be
deleted. This is the same trick as we use for the error
code ERROR_ALREADY_EXISTS.

Added ERROR_ACCESS_DENIED to the list of error codes that
require to change the name of the file to be deleted.


mysys/my_delete.c:
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Added ERROR_ACCESS_DENIED to the list of error codes that
  require to change the name of the file to be deleted.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1