- Adjust CMakeLists.txt to follow latest mysql's expectations about plugins
- Add typecasts
- wrap pbms_enabled.cc in #ifdef

 - innodb-index needs regexp replace for embedded like other similar tests.

 - partitions_special_* need to be modified for the extension from 16 to 32
   max key parts allowed that was made in MariaDB.

When DNS is not working and returns some address even for non-existing
host names, some test cases fail with wrong error.

Fix by disabling these tests on such systems.

"Merge Monty's fixes from main into release branch" .. cset):
- mysql_get_server_name() is a new client API function and so should
  be exported from libmysql[d].

libmysql/libmysql.def:
  mysql_get_server_name() is a new client API function and so should
  be exported from libmysql[d].
libmysqld/libmysqld.def:
  mysql_get_server_name() is a new client API function and so should
  be exported from libmysql[d].

 - Don't omit the @@debug variable from testcase check, since it can cause real problems.
 - Fix some bad merges by reverting to be identical to MySQL 5.1.

mysql-test/include/mtr_check.sql:
  Don't omit the @@debug variable from testcase check, since it can cause real problems.
mysql-test/r/mysqlbinlog_row_big.result:
  Fix incorrect merge.
mysql-test/r/variables-big.result:
  Fix incorrect merge, by reverting to MySQL 5.1 version.
mysql-test/t/mysqlbinlog_row_big.test:
  Fix incorrect merge.
mysql-test/t/variables-big.test:
  Fix incorrect merge, by reverting to MySQL 5.1 version.

storage/maria/ma_blockrec.c:
  GCC warns about const vs. non-const despite cast
  (but it is in any case cleaner to avoid the cast completely)
support-files/compiler_warnings.supp:
  Silence a wrong compiler warning caused by GCC bug.

  'innobase'.

Otherwise following tests go crazy in the log, writing gigabytes of data
and causing havoc.

- Don't run testcase for BUG#45632 with embedded server.

 - MariaDB naming.
 - Error reporting with mysqld --help --verbose.

mysql-test/r/mysqld_option_err.result:
  Test that mysqld --not-known-option --help --verbose gives error
mysql-test/t/mysqld_option_err.test:
  Test that mysqld --not-known-option --help --verbose gives error

- mysql_get_server_name()
  This returns MySQL or MariaDB depending on the server type
- mariadb_connection()
  This returns 1 if you are connected to a MariaDB server

Modifed the MySQL command line client to print out if you are connected to MariaDB or MySQL
Better default prompt (shows server you are connected to and base directory)

client/mysql.cc:
  Print out if you are connected to MariaDB or MySQL
  Better default prompt (shows server you are connected to and base directory)
  Added option \N to prompt to print server name.
configure.in:
  Changed maria to MariaDB in version string
include/mysql.h:
  Added mysql_get_server_name() and mariadb_connection()
include/mysql.h.pp:
  Update for new API functions
libmysql/libmysql.c:
  Added client functions:
  - mysql_get_server_name()
    This returns MySQL or MariaDB depending on the server type
  - mariadb_connection()
    This returns 1 if you are connected to a MariaDB server

to have to rely on fragile regexp-parsing of configure.in.

server, as it doesn't work there.

sql/sql_plugin.cc:
  Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded server, as it doesn't work there.

This allows to eg use --mem or --parallel for better performance on big boxes.

Author: Peter Lieverdink

Don't ever build it, and don't include it in source tarballs.
(we keep the sources in bzr to not get conflicts on every upstream change).

This is needed to fix failures seen in Buildbot (main.ctype_gbk_binlog).
Problem is that some tests did not RESET MASTER, causing them to pick up random
binlog files depending on prior tests.

(These are by their nature difficult to test reliably due to differences in timing).

Fix trivial typo in BUILD/* scripts.

BUILD/SETUP.sh:
  Fix typo.
mysql-test/mysql-test-run.pl:
  Fix mysql-test-run.pl to be able to find plugins used in testing also when running the
  test suite from an installed mysqld package.

 - mysqlslap result file update after merge.
 - Fix skipping certain tests when running test suite as root, got broken somehow.

mysql-test/mysql-test-run.pl:
  Somehow skipping tests when running as root got broken. The mysqltest if() no longer seems
  to accept YES as a true value, so use 1 for true value instead.
mysql-test/r/mysqlslap.result:
  Result file update after change in engine behaviour of mysqlslap.
mysql-test/t/mysqld_option_err.test:
  This test does not work when run as root.

Merge Percona microsec_process patch.
Includes lots of after-merge fixes, Windows fixes, and other misc. small fixes.