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


mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged

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

  - result adjusted.

into  mysql.com:/home/svoj/devel/mysql/BUG31833/mysql-5.1-engines


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

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


mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged

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


mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged

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


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

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

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


mysql-test/r/func_misc.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
mysql-test/t/func_misc.test:
  manual merge.

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

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


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

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


mysql-test/t/disabled.def:
  Manual merge from 5.0.

Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.


mysql-test/suite/rpl/t/disabled.def:
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Moved disabling to rpl suite.

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


sql/sql_insert.cc:
  Auto merged
mysql-test/r/delayed.result:
  manual merge.
mysql-test/t/delayed.test:
  manual merge.

Disabled test case.

  - fix for #31070 (missed during merging) applied for cp932 charset.
  - tests/results adjusted.


mysql-test/include/ctype_common.inc:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_big5.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_cp932.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_euckr.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_gb2312.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_gbk.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/r/ctype_uca.result:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
mysql-test/t/ctype_cp932.test:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - tests/results adjusted.
strings/ctype-cp932.c:
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - fix for #31070 (missed during merging) applied for cp932.

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


client/mysql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0
mysql-test/t/subselect.test:
  Manual merge from 5.0

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  stella.local:/home2/mydev/mysql-5.0-axmrg

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

Disabled the test case.

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

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

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


sql/item_cmpfunc.cc:
  Auto merged

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

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.

Problem: passing a non-constant name to the NAME_CONST function results in a crash.

Fix: check the NAME_CONST name argument; return fake item type if we got
non-constant argument(s).


mysql-test/r/func_misc.result:
  Fix for bug #32559: connection hangs on query with name_const
    - test result.
mysql-test/t/func_misc.test:
  Fix for bug #32559: connection hangs on query with name_const
    - test case.
sql/item.cc:
  Fix for bug #32559: connection hangs on query with name_const
    - Item_name_const::type() now returns NULL_ITEM if non-constant arguments 
      were used to create the item to avoid wrong type casting.
sql/item.h:
  Fix for bug #32559: connection hangs on query with name_const
    - NAME_CONST name argument checked for invariability.

 - 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