system installed (if any).

libmysqld.a(pcre_exec.c.o): relocation R_X86_64_32S against
`_pcre_ucd_stage1' can not be used when making a shared object;
make[2]: Leaving directory `/mnt/buildbot/build/mariadb-10.0.3'
recompile with -fPIC

Changing ADD_LIBRARY(pcre) to ADD_CONVENIENCE_LIBRARY(pcre)

from pcre/CMakeLists.txt

- do not install anything from pcre library
- do not build the c++ library

"PCRE_STATIC" must be defined before including pcre.h
to avoid linking errors:
- unresolved external symbol __imp_regerror
- unresolved external symbol __imp_pcre_exec

Other fix of maybe_null problem and revert of revno: 3608 "MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery from a MERGE view."

Bundled jemalloc can only be on  Linux and OSX without problems.
  
On BSDs, build fails because make does not understand GNU extensions (also BSDs do not need  jemalloc, it is already system malloc).
On Solaris, build fails with compile error.

- Better error message when using huge pages
- Fixed link error
- Test suite should run even on system with huge pages

storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake:
  Fixed that linking works on systems that uses lib64
storage/tokudb/ft-index/portability/huge_page_detection.cc:
  Better error message
storage/tokudb/mysql-test/rpl/suite.pm:
  Test suite should run even on system with huge pages
storage/tokudb/mysql-test/tokudb/suite.pm:
  Test suite should run even on system with huge pages

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

Added --init-command argument to mysqlslap: SQL Command to execute
when connecting to MySQL server. Will automatically be re-executed
when reconnecting.

- The crash was caused because the optimizer called handler->multi_range_read_info()
  on a derived temporary table.  That table has been created, but not opened yet.
  Because of that, handler::table was NULL, which caused crash.
  Fixed by changing DS-MRR methods to use handler::table_share instead. 
  handler::table_share is set in handler ctor, so this should be safe.

- 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.