changed the deprecation border to 6.0 in this case

per-file comments:
  mysql-test/r/backup.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/r/show_check.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/r/sp-error.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/r/sp.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/r/sp_trans.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/r/warnings.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  mysql-test/suite/rpl/r/rpl_sp.result
    Bug#44676      5.4 deprecation messages allege feature removal in lower version
    test result fixed
  sql/mysqld.cc
Bug#44676      5.4 deprecation messages allege feature removal in lower version
  sql/set_var.cc
Bug#44676      5.4 deprecation messages allege feature removal in lower version
  sql/sql_table.cc
Bug#44676      5.4 deprecation messages allege feature removal in lower version
  sql/sql_yacc.yy
Bug#44676      5.4 deprecation messages allege feature removal in lower version

As described in the bug, the problem is not new in 5.4, but newly tickled.
We need a register whose lower 8 bits can be accessed, and must request
such from the assembler.  Using a "q" constraint instead of "r" constraint
accomplishes this.

include/Makefile.am: use @PERL@ to call scripts/dheadgen.pl - don't rely on #! /usr/bin/perl
scripts/dheadgen.pl: use 2-arg open() for compatibility with older Perl versions
storage/innobase/srv/srv0srv.c: Don't use C++-style comments in C code

    the innodb_file_io_threads option isn't present here.
    Changed with the innodb_read/write_io_threads

per-file comments:
  support-files/my-innodb-heavy-4G.cnf.sh

  the problem is in the TIMESTAMP(14) fields of the access-control tables.
  The TIMESTAMP(14) syntax is marked as DEPRECATED since 5.2.
  Fixed by just changed the check to 6.0 as it's done in the 5.1 branch.
      
per-file comments:
  sql/sql_parse.cc
Bug#44394      Assertion Failure
    now it's deprecated since 6.0

Update version number; also modify NDB's version.c for compatibility.

            SQL_SELECT::test_quick_select

The crash was caused by an incomplete cleanup of JOIN_TAB::select
during the filesort of rows for GROUP BY clause inside a subquery.
Queries where a quick index access is replaced with filesort was
was affected. For example:

  SELECT 1 FROM
    (SELECT COUNT(DISTINCT c1) FROM t1
       WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x

Quick index access related data in the SQL_SELECT::test_quick_select
function was inconsistent after an incomplete cleanup.
This function has been completed to prevent crashes in the
SQL_SELECT::test_quick_select function.

165 changesets with 23 conflicts:
Text conflict in mysql-test/r/lock_multi.result
Text conflict in mysql-test/t/lock_multi.test
Text conflict in mysql-test/t/mysqldump.test
Text conflict in sql/item_strfunc.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/parse_file.cc
Text conflict in sql/slave.cc
Text conflict in sql/sp.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_class.cc
Text conflict in sql/sql_crypt.cc
Text conflict in sql/sql_db.cc
Text conflict in sql/sql_lex.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_view.cc
Text conflict in storage/innobase/handler/ha_innodb.cc
Text conflict in storage/myisam/mi_packrec.c
Text conflict in tests/mysql_client_test.c

Updates to Innobase, taken from main 5.1:
bzr: ERROR: Some change isn't sane:
File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated.
File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated.
File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated.
File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated.
File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated.
File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated.
File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated.
File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated.
File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated.
File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated.
File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated.
File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated.
File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated.
File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated.
(Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)

                               table corruption

Disabling the mysiam_debug.test in embedded mode because of BUG#43733