MDEV-4735 - Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on
            attempt to create a temporary SPIDER table connecting to
            non-existing source
MDEV-4737 - Server crashes in spider_mysql_handler::append_match_against on
            SELECT .. MATCH .. AGAINST .. BOOLEAN MODE
MDEV-4738 - INSERT DELAYED on a SPIDER table doesn't produce
            ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't
            honor lock_wait_timeout like normal INSERT

- merged test cases for MySQL bug#27480
- fixed that LOCK TABLES was unable to open temporary table
  (covered by grant2 test, merged appropriate code from 5.6)
- commented lines that cause server crash in merge test, reported
  MDEV-5042 (not relevant to bug#27480)

Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)

read also [mariadb_safe] section.
modify the manpage accordingly (and remove a netware-specific option from it)

MDEV-5035 debian package conflict libmariadbclient18 5.5.33+maria-1~wheezy vs. mariadb-server-5.3 5.3.12-mariadb122~wheezy

fix MDEV-4735 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on attempt to create a temporary SPIDER table connecting to non-existing source

fix MDEV-4738 INSERT DELAYED on a SPIDER table doesn't produce ER_DELAYED_NOT_SUPPORTED, doesn't work like delayed, and doesn't honor lock_wait_timeout like normal INSERT

fix MDEV-4737 Server crashes in spider_mysql_handler::append_match_against on SELECT .. MATCH .. AGAINST .. BOOLEAN MODE

Don't fail when an frm is inconsistent (legacy DB_TYPE_xxx code doesn't match the
engine name), use the engine name, ignore the legacy code.

Merged main.host_cache_size_functionality test.

Test had to be adjusted because MariaDB doesn't have
MySQL variables auto-tuning code.

don't set TABLE_SHARE::keys before TABLE_SHARE::key_info is set,
otherwise an error might leave only the first property set and it will
confuse TABLE_SHARE::destroy()

Fix of API of dynamic columns (it made uniform and real function used to free the string).

MDEV-4949 - Spider engine causes compilation errors if compiled without
            partitioning

- issue proper error message if query id is not found
- do not allow kill query id 0
- fixed ps-protocol and embedded tests

pending merges:
  Alexander Barkov 2013-09-16 backport from 10.0

mtr can crash occasionally.
This happens when mtr sends to a child mtr process (or vice-versa) a packet,
that gets truncated or, perhaps, split in two.
Then the other side cannot deserialize it and fails as above.