it didn't help, instead it only broke upgrades even more

Unlike MyISAM, InnoDB does not support boolean full-text searches on 
nonindexed columns, but this restriction was not enforced, resulting 
in queries that returned incorrect results. (Bug #16434374)

appears to be unset, or when it contains 'root' even though the user
does not have real root permissions

Turned off Performance Schema for Spider test suite

Rules performed unnecessary copying which made tests run with wrong
global testdir

Port to mariadb-1.0 the following fix from mysql-5.6:

  Revision ID: jorgen.loland@oracle.com-20120314131055-ml54x9deueqfsff4
  BUG#13701206: WHERE A>=B DOES NOT GIVE SAME EXECUTION PLAN
                AS WHERE B<=A (RANGE OPTIMIZER)
 
that fix didn't have a public testcase, so I created one.

which has been removed earlier, but somehow got into the sources again.

This file is not really needed, and it prints warnings
"sys/timeb.h is deprecated" for every file when compiling on FreeBSD.

ltime.time_type == MYSQL_TIMESTAMP_NONE ||
mysql_type_to_time_type(cached_field_type) == ltime.time_type'
fails with IF, ISNULL, ADDDATE

* roles.grant_proxy-5526 test for --embedded
* gcc warning in Connect

Cleanups:
* remove unused HA_EXTRA_EXPORT (can be added later if needed, e.g. for Aria)
* clarify the meaning of HA_CAN_EXPORT
* make all engines that support EXPORT to announce it
* reduce code duplication

Syntax. Server support. Test cases.
InnoDB bugfixes:
* don't mess around with system sprintf's, always use my_error() for errors.
* don't use InnoDB internal error codes where OS error codes are expected.
* don't say "file not found", when it was.

only let filesort() count rows for SQL_CALC_ROWS if it's using priority queue

Update InnoDB to 5.6.14
Apply MySQL-5.6 hack for MySQL Bug#16434374
Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB)
Fix InnoDB memory leak