Removed unnecessary server options --rpl-recovery-rank. This is obsolete
and does not affect the test suite in any useful way.


mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
  updated result file
mysql-test/suite/rpl/rpl_1slave_base.cnf:
  removed unnecessary option

According to documenation:
http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-replication-issues.html

When setting up circular replication for clusters with different
SQL nodes in each cluster used as replication master and slave,
SQL nodes must not start with --log-slave-updates option. 

This patch fixed the test case by remove log-slave-updates 
configuration from test case configuration file.

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf:
  remove option --log-slave-updates
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  ndbcluster only supports mixed or row binlog format

mysql-test/extra/rpl_tests/rpl_log.test:
  Using RESET MASTER in the middle of a sequence of statements cause
  a race condition between the dump thread sending the preceeding
  statements to the slave and the RESET MASTER.
mysql-test/suite/federated/federated.test:
  Fixing include paths.
mysql-test/suite/federated/federated_bug_25714.test:
  Removing extreneous lines added by merge.
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
  Correcting typo (the spaces following the connection name was included as part of the name).
mysql-test/t/distinct.test:
  Correcting paths.

Removed the flag that disables innodb on slave in the default
configuration of replication tests. That made the explicit
--innodb flag in -slave.opt files redundant, so lots of -slave.opt
files could be removed. Also, -master.opt files containing reduntant
--innodb flag were removed (those were redundant even without
changing the default). Removing .opt files is good because .opt
files cause server restarts and make tests less readable.
Also fixed a bug where rpl_innodb_mixed_ddl unintentionally
used myisam on slave.


mysql-test/suite/rpl/r/rpl_innodb.result:
  updated result file
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
  updated result file. this is how the test is supposed to be, it was a bug
  that it used myisam on the slave.
mysql-test/suite/rpl/rpl_1slave_base.cnf:
  Removed flag to disable innodb on slave, and added explicit --loose-innodb
  flags on both master and slave.
mysql-test/suite/rpl/t/rpl_innodb.test:
  Ensure that the slave uses myisam (this was previously done
  by not adding the --innodb flag on slave).

Problem: In the mysqltest language, it was not possible to set the current
connection from a variable, and it was not possible to read the current
connection.
Fix: Allow setting the connection from a variable, like:
connection $variable;
and introduce the mysqltest language variable $CURRENT_CONNECTION, which
holds the name of the current connection.


client/mysqltest.cc:
  - Made select_connection use the common argument parser instead of its own
  home-rolled version. That allows variable expansion, for instance.
  - Made select_connection_name set the variable $CURRENT_CONNECTION, so that
  test scripts can use that.
  - Refactored a bit so that stuff that needs to be done when changing connection
  is located to one place.
mysql-test/t/mysqltest.test:
  Added test case for $CURRENT_CONNECTION and "connection $variable"

            
Debug builds of MySQL 5.1, 6.0 with Sun Studio 12 broke because of
use of gcc specific feature.
            
The fix is to replace __FUNCTION__ with the corresponding character string

Problem 1: not_embedded_server runs SELECT FROM I_S.PROCESSLIST near the beginning.
check_testcase executes a query to the server before that. There is a race here,
because there is no guarantee that the thread executing check_testcase's query is
finished.
Problem 2: The SELECT FROM I_S.PROCESSLIST doens't seem very useful in the test.
It's at least misplaced.
Fix to both problems: Comment out SELECT FROM I_S.PROCESSLIST.


mysql-test/t/not_embedded_server.test:
  Commented out failing / useless test.

Problem: during a refactoring of mtr, a pattern for suppressing a warning from lowercase_table3 was lost.
Fix: re-introduce the suppression.
Problem 2: suppression was misspelt as supression. Fixed by adding a p.


mysql-test/include/mtr_warnings.sql:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_bug33931.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_idempotency.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_temporary.test:
  fixed spelling error
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
  fixed spelling error
mysql-test/t/lowercase_table3.test:
  fixed spelling error

Post-push fixes making it work on pushbuild's valgrind host, and clarifying the output.


mysql-test/lib/My/CoreDump.pm:
  - Improved parsing of mtr output so that it works on pushbuild's "valgrind" host.
  - Added stack trace for the thread that coredumped, to make output more readable when there are many threads.
  - Added explanation of what the output consists of.
  - Added early removal of temp file.

BUG#39008 Additional fix after review, remove files that could potentially be set to path outside datadir

           derived table cause crash

When a multi-UPDATE command fails to lock some table, and
subsequently succeeds, the tables need to be reopened if
they were altered. But the reopening procedure failed for
derived tables.

Extra cleanup has been added.


mysql-test/r/lock_multi.result:
  Added test case for bug #38499.
mysql-test/t/lock_multi.test:
  Added test case for bug #38499.
sql/sql_union.cc:
  Bug#38499: flush tables and multitable table update with
             derived table cause crash
  
  Obsolete assertion has been removed.
sql/sql_update.cc:
  Bug#38499: flush tables and multitable table update with
             derived table cause crash
  
  Extra cleanup for derived tables has been added:
  1) unit.cleanup(),
  2) unit->reinit_exec_mechanism().

Fixed a compilation warning

BUG#38559 Annoying cygwin problem fixed by resolving  pid->winpid before kill instead of just after fork

upgrade from <=5.0.46 to >=5.0.48

Problem: 'check table .. for upgrade' doesn't detect 
incompatible collation changes made in 5.0.48.

Fix: check for incompatible collation changes.


sql/handler.cc:
  Fix for bug#39585: innodb and myisam corruption after binary 
  upgrade from <=5.0.46 to >=5.0.48
    - check for incompatible collation changes made in 5.0.48:
  bug #29461
    latin7_general_ci
    latin7_general_cs
    latin7_estonian_cs
    latin2_hungarian_ci
    koi8u_general_ci
    cp1251_ukrainian_ci
    cp1250_general_ci
  bug #29499, bug #27562
    ascii_general_ci