References: MDEV-4572 - merge with mariaDB 5.5.31

bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31

Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt.  Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved.  Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.

3 files changed, 41 insertions, 4 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 339d27bff00..5376ed58974 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -21,8 +21,8 @@ source ./VERSION
 UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
 RELEASE_EXTRA=""
 
-RELEASE_NAME=mariadb
-PATCHLEVEL=""
+RELEASE_NAME=""
+PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 
 # Look up distro-version specific stuff.
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 3a5510650d1..d2962c0cd7a 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -39,7 +39,7 @@ Description: MariaDB database server with Galera cluster binaries
 Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-galera-server-5.5, ${misc:Depends}
+Depends: mariadb-galera-server-5.5 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database server with Galera cluster
  (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
@@ -52,3 +52,22 @@ Description: MariaDB database server with Galera cluster
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
+
+Package: mariadb-client
+Section: database
+Architecture: all
+Depends: mariadb-client-5.5 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database client (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-client (currently mariadb-client-5.5), as determined by the MariaDB
+ maintainers.  Install this package if in doubt about which MariaDB version
+ you want, as this is the one we consider to be in the best shape.
+
+Package: mariadb-test
+Section: database
+Architecture: all
+Depends: mariadb-test-5.5 (= ${source:Version})
+Description: MariaDB database regression test suite (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
+ maintainers.
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 8ad7471815c..d1cf8531932 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -39,7 +39,7 @@ Description: MariaDB database server with Galera cluster binaries
 Package: mariadb-galera-server
 Section: database
 Architecture: all
-Depends: mariadb-galera-server-5.5, ${misc:Depends}
+Depends: mariadb-galera-server-5.5 (= ${source:Version}), ${misc:Depends}
 Description: MariaDB database with Galera cluster server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-server (currently mariadb-server-5.5), as determined by the MariaDB
@@ -52,3 +52,21 @@ Description: MariaDB database with Galera cluster server (metapackage depending
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
 
+Package: mariadb-client
+Section: database
+Architecture: all
+Depends: mariadb-client-5.5 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database client (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-client (currently mariadb-client-5.5), as determined by the MariaDB
+ maintainers.  Install this package if in doubt about which MariaDB version
+ you want, as this is the one we consider to be in the best shape.
+
+Package: mariadb-test
+Section: database
+Architecture: all
+Depends: mariadb-test-5.5 (= ${source:Version})
+Description: MariaDB database regression test suite (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
+ maintainers.