modified:
  storage/connect/libdoc.cpp

modified:
  mysql-test/valgrind.supp

  by Valgrind. This concerns the XML libxml2 support.

modified:
  storage/connect/domdoc.cpp
  storage/connect/domdoc.h
  storage/connect/ha_connect.cc
  storage/connect/libdoc.cpp
  storage/connect/plgdbsem.h
  storage/connect/plgxml.h
  storage/connect/tabxml.cpp
  storage/connect/tabxml.h

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

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

defined(OpenBSD) -> defined(__OpenBSD__)


modified:
  storage/connect/os.h

modified:
  storage/connect/os.h

- Uniforms line endings

modified:
  storage/connect/tabutil.cpp

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