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.

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()

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.

Adding tests only.

The problem was earlier fixed by 
MDEV-4724 Some temporal functions do not preserve microseconds 

pending merges:
  Alexander Barkov 2013-09-16 MDEV-4870 Wrong values of CASE, COALESCE, IF...

Adding test cases from the bug report only.

The problem was earlier fixed by:
MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context

modified:
  mysql-test/r/func_time.result
  mysql-test/t/func_time.test

pending merges:
  Alexander Barkov 2013-09-16 MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)

Adding a test case only.

The problem was fixed by:

  MDEV-4724 Some temporal functions do not preserve microseconds

modified:
  mysql-test/r/func_time.result
  mysql-test/t/func_time.test

pending merges:
  Alexander Barkov 2013-09-16 MDEV-4843 Wrong data type for TIMESTAMP('200...

The patch for mdev-4355 had a defect: the cached values for bitmaps of
used tables were not updated when processing degenerate OR formulas.

MDEV-5012 Server crashes in Item_ref::real_item on EXPLAIN with select subqueries or views, constant table, derived_merge+derived_with_keys

revert incorrect change, merged from mysql-5.5

pending merges:
  Alexander Barkov 2013-09-13 MDEV-4724 Some temporal functions do not preserve mic...

pending merges:
  Alexander Barkov 2013-09-12 MDEV-4724 Some temporal functions do not pre...

Removed unneeded set of TABLE_LIST::skip_temporary flag.

- Provide a special execution path for cleanup of degenerate 
  non-merged semi-join children of degenerate selects.

BUILD/compile-solaris-amd64:
  * call cmake directly, don't go through three layers of wrappers
    (but preserve the compile-solaris-amd64 file - buildbot uses it for 5.1 and 5.5)
  * disable jemalloc, it doesn't compile on our sol10-64 box
storage/federated/ha_federated.cc:
  clang warning
storage/tokudb/CMakeLists.txt:
  * require cmake-2.8.9, because 2.8.8 doesn't add -fPIC for POSITION_INDEPENDENT_CODE
    property that ft-index CMakeLists.txt files are using

* add TokuDB, together with the ft-index library
* cmake support, auto-detecting whether tokudb can be built
* fix packaging - tokudb-engine.rpm, deb
* remove PBXT
* add jemalloc
* the server is built with jemalloc by default even if TokuDB is not built
* documentation files in RPM are installed in the correct location
* support for optional deb packages (tokudb has specific build requirements)
* move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
* correct mariadb-test.deb to be not architecture-independent
* fix out-of-tree builds to never modify in-tree files
* new handler::prepare_index_scan() method

It puts files in the correct location for rpm/deb packages.

After MDEV-4817, WHERE clause may be evaluated early, in fix_fields.
In ps-protocol fix_fields happens both for prepare and execute phase,
generating double the number of warnings from the early WHERE clause
executions.