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


include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/ndb/t/disabled.def:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysql.cc:
  Manual merge
mysql-test/suite/rpl/t/disabled.def:
  Manual merge

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

mysql-test/suite/ndb/t/disabled.def:
  Disabling failing tests.
mysql-test/suite/rpl/t/disabled.def:
  Disabling failing tests.
mysql-test/suite/rpl/t/rpl_ssl.test:
  Disabling part of test that fails.

  - archive test/result adjusted.
  - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.


mysql-test/r/archive.result:
  after-merge fix:
    - archive test/result adjusted.
mysql-test/r/partition.result:
  after-merge fix:
    - test case added.
mysql-test/t/archive.test:
  after-merge fix:
    - archive test/result adjusted.
mysql-test/t/partition.test:
  after-merge fix:
    - test case added.

Some test cases were missing preparation to deal with failed
predecessor test cases.

Added preparation (drop table if exists) to some test cases.


mysql-test/include/innodb_rollback_on_timeout.inc:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Added preparation (drop table if exists).
mysql-test/r/innodb-semi-consistent.result:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Fixed test result.
mysql-test/r/innodb-ucs2.result:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Fixed test result.
mysql-test/r/innodb_mysql.result:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Fixed test result.
mysql-test/r/innodb_timeout_rollback.result:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Fixed test result.
mysql-test/t/innodb-semi-consistent.test:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Added preparation (drop table if exists).
mysql-test/t/innodb-ucs2.test:
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  Added preparation (drop table if exists).

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


mysql-test/r/analyze.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
sql/sql_yacc.yy:
  5.0 -> 5.1 manual merging (see bug #30495: optimize table t1,t2,t3 extended errors):
  CHECK options disabled for ANALYZE/OPTIMIZE PARTITION.

 - Additional patch to fix compiler warnings


client/mysql.cc:
  Initialize warnings to 0 to avid compiler warning
  Call 'print_warnings' also when error occured
mysql-test/r/mysql.result:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql
mysql-test/t/mysql.test:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql

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.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-merge

slave's error log when running rpl_extraColmaster_*.test 

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

mysql-test/suite/rpl_ndb/t/disabled.def:
  Disabling failing test.

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