diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index eab724fac040bed1ff1018610412534cee5eacc1..a3947279ee036b8ec7ab36899da553fc7e552e2e 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -1,4 +1,32 @@
-Tip:
+# README for Debian package maintainers #
+
+This file mostly applies to how the packaging workflow works for the official Debian packages, but it may contain useful information also for anybody doing their own private .deb builds.
+
+
+## Building from sources with git-buildpackage ##
+
+Clone sources with all branches
+  sudo apt-get install git-buildpackage
+  gbp-clone --pristine-tar git://git.debian.org/git/pkg-mysql/mariadb-5.5.git
+
+Aalternatively use Github mirror at https://github.com/ottok/mariadb-5.5.git
+
+On later runs make sure to have latest version of sources
+  gbp-pull --pristine-tar --force
+
+Install all build dependencies manually (see debian/control for latest full list)
+  sudo apt-get install bison chrpath cmake debhelper hardening-wrapper libaio-dev libboost-dev libjemalloc-dev libjudy-dev libncurses5-dev libpam0g-dev libreadline-gplv2-dev libssl-dev libwrap0-dev lsb-release perl po-debconf psmisc zlib1g-dev
+
+Build
+  git-buildpackage --git-pristine-tar
+
+For a more elaborate setup with automatic build dependency installation and multi-target chroot usage check out how http://labs.seravo.fi/~otto/mariadb-repo/build.sh uses git-buildpackage with pbuilder.
+
+If the build fails the easiest way to clean up before a new run is
+  git clean -f -d && git reset --hard
+
+
+### Tip ###
 
   Don't run the mysql-test-run test suite as part of build.
   It takes a lot of time, and we will do a better test anyway in
@@ -6,4 +34,150 @@ Tip:
 
     export DEB_BUILD_OPTIONS="nocheck"
 
+  If you want to run the build in parallel on 2 CPUs and have verbose output, use:
+    export DEB_BUILD_OPTIONS="parallel=2 verbose"
+
+  The options above can also be combined freely to get required behaviour.
+
+
+## Importing initial sources from upstream the first fime ##
+
+Create repository
+  mkdir mariadb-5.5
+  cd mariadb-5.5
+  git init
+  git branch upstream
+  git-import-orig --pristine-tar ../../upstream/mariadb-5.5.36
+
+Fill in values prompted
+  What will be the source package name? [mariadb] mariadb-5.5
+  What is the upstream version? [5.5.36]
+
+Checkout master into working dir and finish up manually what needs to be done
+  git checkout master
+
+Eventually commit and push, build, test binaries, test packages etc..
+  git commit -m "Created Debian packaging using git-buildpackage for easy maintenance"
+  git push --all
+  git push --tags
+
+
+## Upgrading sources from upstream ##
+
+Upstream will publish maintenance releases at least 5 years after the major version release, and security updates are likely to come even after that as long as major distributions ship the version.
+
+See table at https://mariadb.com/kb/en/mariadb/development/mariadb-maintenance-policy/
+
+Release notes are available at https://mariadb.com/kb/en/mariadb/development/release-notes/
+
+
+### Steps to import new upstream version ###
+
+Download new source package
+  cd pkg-mariadb-5.5
+  uscan --verbose
+
+Enter git repostitory path and apply new sources
+  cd mariadb-5.5
+  git-import-orig --pristine-tar ../mariadb-5.5.36.tar.gz
+
+Generate new debian/changelog entry
+  dch -v 5.5.36-1 -D unstable
+
+Manually merge what needs to be done
+
+Commit and push
+  git commit -am "Merged with upstream 5.5.36"
+  git push --all; git push --all github
+  git push --tags; git push --tags github
+
+Note that in above if you want to sync to Github directly you need to have collaborator rights to the Github repo and you need to add it as a secondary remote location with:
+  git remote add origin git@github.com:ottok/mariadb-5.5.git
+
+To push to the git.debian.org repos you need to a member of the pkg-mysql team at Alioth. It does not matter which repository you push to, eventually they are synced with each other anyway.
+
+
+### Maintaining patches ###
+
+Test that the patches still apply by running:
+  export QUILT_PATCHES=debian/patches
+  quilt import
+  quilt push -a
+
+If there are any rejects, inspect the files and update the patches.
+
+### Maintaining symbols file for libmariadbclient18 et al ###
+
+Update symbols file:
+  dpkg-gensymbols -plibmariadbclient18 -Idebian/libmariadbclient18.symbols -Pdebian/libmariadbclient18 -edebian/libmariadbclient18/usr/lib/mysql/plugin/mysql_clear_password.so -edebian/libmariadbclient18/usr/lib/mysql/plugin/dialog.so -edebian/libmariadbclient18/usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0 > symbols.patch
+
+  patch debian/libmariadbclient18.symbols symbols.patch
+
+Finish it manually by e.g. making sure there are no '-1' file versions, upstream versions is enough. Finally remember to selectively commit:
+  git add debian/libmariadbclient18.symbols
+  git commit -m "Updated symbols file"
+
+
+### Maintaining debian/copyright ###
+
+First install packages: license-reconcile devscripts cdbs
+
+Check if licenses match
+  license-reconcile
+
+Create new copyright file
+  licensecheck --copyright -r . -c . | /usr/lib/cdbs/licensecheck2dep5 > /tmp/copyright
+
+..but you need to do lots of manual work to merge the new file with the old, as liscensecheck has a lot of cruft and the original copyright file already had those cleaned up.
+
+
+### Quality control ###
+
+Run wrap-and-sort to style contents in debian/*
+  wrap-and-sort
+
+Once packages are done check their quality with Lintian
+  lintian -EvIL +pedantic --color=always *.deb
+
+
+## Uploading to Ubuntu PPA for testing ##
+
+Make sure you have key ID set up in ~/.devscripts to avoid using -k parameter
+  DEBSIGN_KEYID=B7F7E4E1
+
+These are good to have as environment variables (replace values with your own)
+  DEBEMAIL="otto@seravo.fi"
+  DEBFULLNAME="Otto Kekäläinen"
+  export DEBEMAIL DEBFULLNAME
+
+The run the commands to automatically change version and upload
+  backportpackage -u ppa:mysql-ubuntu/mariadb -d precise -r *.dsc -S ~ppa1 -y
+
+## Uploading to Ubuntu security releases ##
+
+See examples with documented procedures:
+ * https://bugs.launchpad.net/ubuntu/+source/mariadb-5.5/+bug/1313187
+ * https://bugs.launchpad.net/ubuntu/+source/mariadb-5.5/+bug/1363222
+
+Probably the most optimal workflow would be to create a git branch (e.g. ubuntu-14.04) with custom gbp.conf and maintaining it by importing upstream in one commit, and updating changelog and other stuff, including refreshing patches in another commits, so that it would be easy to produce a patch file that Ubuntu security team can apply upon the mix of previous debian/ contents from Ubuntu archive and updated others from upstream. This would allow to use git-buildpackage to produce test builds instead of plain 'fakeroot dpkg-buildpackage'.
+
+## Comparison to other distributions ##
+
+For tracking security release information, finding solutions for build errors on many architechtures and for general quality control it can be useful to keep an eye on what packagers in other distributions do:
+
+Fedora:
+  * https://apps.fedoraproject.org/packages/mariadb/
+  * http://pkgs.fedoraproject.org/cgit/mariadb.git/
+OpenSUSE:
+  * https://build.opensuse.org/package/show/server:database/mariadb
+Arch Linux:
+  * https://projects.archlinux.org/svntogit/packages.git/?h=packages/mariadb
+Mageia:
+  * http://svnweb.mageia.org/packages/cauldron/mariadb/current/
+
+## Notes about hard to fix bugs ##
+
+The following issues at https://qa.debian.org/bls/packages/m/mariadb-5.5.html are due to a bug in GCC which has been reported to GCC and will become fixed eventually:
+  E array-bounds /??PKGBUILDDIR??/strings/decimal.c:300 (arm64, armel, armhf, i386, mips, mipsel, powerpc, ppc64el, sparc)
+  E array-bounds /??PKGBUILDDIR??/strings/decimal.c:496 (arm64, armel, armhf, i386, mips, mipsel, powerpc, ppc64el, sparc)
 
diff --git a/debian/additions/mysql_tableinfo.1 b/debian/additions/mysql_tableinfo.1
deleted file mode 100644
index 1de4f5d59433a7dc08cc34d0fe9314f93dcd7b2f..0000000000000000000000000000000000000000
--- a/debian/additions/mysql_tableinfo.1
+++ /dev/null
@@ -1,322 +0,0 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "MYSQL_TABLEINFO 1"
-.TH MYSQL_TABLEINFO 1 "2003-04-05" "perl v5.8.0" "User Contributed Perl Documentation"
-.SH "NAME"
-mysql_tableinfo \- creates and populates information tables with 
-the output of SHOW DATABASES, SHOW TABLES (or SHOW TABLE STATUS), 
-SHOW COLUMNS and SHOW INDEX.
-.PP
-This is version 1.1.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  mysql_tableinfo [OPTIONS] database_to_write [database_like_wild] [table_like_wild]
-.Ve
-.PP
-.Vb 2
-\&  Do not backquote (``) database_to_write, 
-\&  and do not quote ('') database_like_wild or table_like_wild
-.Ve
-.PP
-.Vb 1
-\&  Examples:
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info this_db
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info %a% b%
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info --clear-only
-.Ve
-.PP
-.Vb 1
-\&  mysql_tableinfo info --col --idx --table-status
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-mysql_tableinfo asks a MySQL server information about its
-databases, tables, table columns and index, and stores this
-in tables called `db`, `tbl` (or `tbl_status`), `col`, `idx` 
-(with an optional prefix specified with \-\-prefix).
-After that, you can query these information tables, for example
-to build your admin scripts with \s-1SQL\s0 queries, like
-.PP
-\&\s-1SELECT\s0 \s-1CONCAT\s0(\*(L"\s-1CHECK\s0 \s-1TABLE\s0 \*(R",`database`,\*(L".\*(R",`table`,\*(L" \s-1EXTENDED\s0;\*(R") 
-\&\s-1FROM\s0 info.tbl \s-1WHERE\s0 ... ;
-.PP
-as people usually do with some other \s-1RDBMS\s0
-(note: to increase the speed of your queries on the info tables,
-you may add some index on them).
-.PP
-The database_like_wild and table_like_wild instructs the program
-to gather information only about databases and tables
-whose names match these patterns. If the info
-tables already exist, their rows matching the patterns are simply
-deleted and replaced by the new ones. That is,
-old rows not matching the patterns are not touched.
-If the database_like_wild and table_like_wild arguments
-are not specified on the command-line they default to \*(L"%\*(R".
-.PP
-The program :
-.PP
-\&\- does \s-1CREATE\s0 \s-1DATABASE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write
-where database_to_write is the database name specified on the command\-line.
-.PP
-\&\- does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`db`
-.PP
-\&\- fills database_to_write.`db` with the output of
-\&\s-1SHOW\s0 \s-1DATABASES\s0 \s-1LIKE\s0 database_like_wild
-.PP
-\&\- does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`tbl`
-(respectively database_to_write.`tbl_status`
-if the \-\-tbl\-status option is on)
-.PP
-\&\- for every found database,
-fills database_to_write.`tbl` (respectively database_to_write.`tbl_status`)
-with the output of 
-\&\s-1SHOW\s0 \s-1TABLES\s0 \s-1FROM\s0 found_db \s-1LIKE\s0 table_like_wild
-(respectively \s-1SHOW\s0 \s-1TABLE\s0 \s-1STATUS\s0 \s-1FROM\s0 found_db \s-1LIKE\s0 table_like_wild)
-.PP
-\&\- if the \-\-col option is on,
-    * does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`col`
-    * for every found table,
-      fills database_to_write.`col` with the output of 
-      \s-1SHOW\s0 \s-1COLUMNS\s0 \s-1FROM\s0 found_tbl \s-1FROM\s0 found_db
-.PP
-\&\- if the \-\-idx option is on,
-    * does \s-1CREATE\s0 \s-1TABLE\s0 \s-1IF\s0 \s-1NOT\s0 \s-1EXISTS\s0 database_to_write.`idx`
-    * for every found table,
-      fills database_to_write.`idx` with the output of 
-      \s-1SHOW\s0 \s-1INDEX\s0 \s-1FROM\s0 found_tbl \s-1FROM\s0 found_db
-.PP
-Some options may modify this general scheme (see below).
-.PP
-As mentioned, the contents of the info tables are the output of
-\&\s-1SHOW\s0 commands. In fact the contents are slightly more complete :
-.PP
-\&\- the `tbl` (or `tbl_status`) info table 
-  has an extra column which contains the database name,
-.PP
-\&\- the `col` info table
-  has an extra column which contains the table name,
-  and an extra column which contains, for each described column,
-  the number of this column in the table owning it (this extra column
-  is called `Seq_in_table`). `Seq_in_table` makes it possible for you
-  to retrieve your columns in sorted order, when you are querying
-  the `col` table. 
-.PP
-\&\- the `index` info table
-  has an extra column which contains the database name.
-.PP
-Caution: info tables contain certain columns (e.g.
-Database, Table, Null...) whose names, as they are MySQL reserved words,
-need to be backquoted (`...`) when used in \s-1SQL\s0 statements.
-.PP
-Caution: as information fetching and info tables filling happen at the
-same time, info tables may contain inaccurate information about
-themselves.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\-\-clear" 4
-.IX Item "--clear"
-Does \s-1DROP\s0 \s-1TABLE\s0 on the info tables (only those that the program is
-going to fill, for example if you do not use \-\-col it won't drop
-the `col` table) and processes normally. Does not drop database_to_write.
-.IP "\-\-clear\-only" 4
-.IX Item "--clear-only"
-Same as \-\-clear but exits after the DROPs.
-.IP "\-\-col" 4
-.IX Item "--col"
-Adds columns information (into table `col`).
-.IP "\-\-idx" 4
-.IX Item "--idx"
-Adds index information (into table `idx`).
-.IP "\-\-prefix prefix" 4
-.IX Item "--prefix prefix"
-The info tables are named from the concatenation of prefix and,
-respectively, db, tbl (or tbl_status), col, idx. Do not quote ('')
-or backquote (``) prefix.
-.IP "\-q, \-\-quiet" 4
-.IX Item "-q, --quiet"
-Does not warn you about what the script is going to do (\s-1DROP\s0 \s-1TABLE\s0 etc)
-and does not ask for a confirmation before starting.
-.IP "\-\-tbl\-status" 4
-.IX Item "--tbl-status"
-Instead of using \s-1SHOW\s0 \s-1TABLES\s0, uses \s-1SHOW\s0 \s-1TABLE\s0 \s-1STATUS\s0
-(much more complete information, but slower). 
-.IP "\-\-help" 4
-.IX Item "--help"
-Display helpscreen and exit
-.IP "\-u, \-\-user=#" 4
-.IX Item "-u, --user=#"
-user for database login if not current user. Give a user
-who has sufficient privileges (\s-1CREATE\s0, ...).
-.IP "\-p, \-\-password=# (INSECURE)" 4
-.IX Item "-p, --password=# (INSECURE)"
-password to use when connecting to server.
-WARNING: Providing a password on command line is insecure as it is visible through /proc to anyone for a short time.
-.IP "\-h, \-\-host=#" 4
-.IX Item "-h, --host=#"
-host to connect to
-.IP "\-P, \-\-port=#" 4
-.IX Item "-P, --port=#"
-port to use when connecting to server
-.IP "\-S, \-\-socket=#" 4
-.IX Item "-S, --socket=#"
-\&\s-1UNIX\s0 domain socket to use when connecting to server
-.SH "WARRANTY"
-.IX Header "WARRANTY"
-This software is free and comes without warranty of any kind. You
-should never trust backup software without studying the code yourself.
-Study the code inside this script and only rely on it if \fIyou\fR believe
-that it does the right thing for you.
-.Sp
-Patches adding bug fixes, documentation and new features are welcome.
-.SH "TO DO"
-.IX Header "TO DO"
-Use extended inserts to be faster (for servers with many databases
-or tables). But to do that, must care about net\-buffer\-length.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-2002\-06\-18 Guilhem Bichot (guilhem.bichot@mines\-paris.org)
-.Sp
-And all the authors of mysqlhotcopy, which served as a model for 
-the structure of the program.
diff --git a/debian/dist/Ubuntu/apparmor-profile b/debian/apparmor-profile
similarity index 100%
rename from debian/dist/Ubuntu/apparmor-profile
rename to debian/apparmor-profile
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 3ee877af482418abaeeb882ac8c053a3d9d6d0ef..9210c20a38693c14c424b4c9500354673d27ccd1 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -27,44 +27,7 @@ RELEASE_NAME=""
 PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 
-# Look up distro-version specific stuff.
-#
-# Libreadline changed to GPLv3. Old GPLv2 version is available, but it
-# is called different things on different versions.
 CODENAME="$(lsb_release -sc)"
-case "${CODENAME}" in
-  etch)  LIBREADLINE_DEV=libreadline-dev ;;
-  lenny|hardy|intrepid|jaunty|karmic|lucid)  LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;;
-  squeeze|maverick|natty)  LIBREADLINE_DEV=libreadline5-dev ;;
-  *)  LIBREADLINE_DEV=libreadline-gplv2-dev ;;
-esac
-
-case "${CODENAME}" in
-  etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;;
-  *) CMAKE_DEP='cmake (>= 2.7), ' ;;
-esac
-
-# Clean up build file symlinks that are distro-specific. First remove all, then set
-# new links.
-DISTRODIRS="$(ls ./debian/dist)"
-for distrodir in ${DISTRODIRS}; do
-  DISTROFILES="$(ls ./debian/dist/${distrodir})"
-  for distrofile in ${DISTROFILES}; do
-    rm -f "./debian/${distrofile}";
-  done;
-done;
-
-# Set no symlinks for build files in the debian dir, so we avoid adding AppArmor on Debian.
-DISTRO="$(lsb_release -si)"
-echo "Copying distribution specific build files for ${DISTRO}"
-DISTROFILES="$(ls ./debian/dist/${DISTRO})"
-for distrofile in ${DISTROFILES}; do
-  rm -f "./debian/${distrofile}"
-  sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \
-      -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g"             \
-    < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}"
-  chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}"
-done;
 
 # Adjust changelog, add new version.
 #
diff --git a/debian/changelog b/debian/changelog
index 4cdb48928bd8ee4f6dadc7bf5ee40375d56470fb..add9ae64dc7623e50dc22033418df3a35a8b4df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mariadb-5.5 (5.5.40-0ubuntu0.14.04.1) trusty-security; urgency=medium
+mariadb-5.5 (5.5.40-0ubuntu0.14.10.1) utopic-security; urgency=medium
 
   * SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
     - CVE-2014-6507
@@ -12,39 +12,64 @@ mariadb-5.5 (5.5.40-0ubuntu0.14.04.1) trusty-security; urgency=medium
     - CVE-2014-6464
   * Add bsdutils as mariadb-server dependency like upstream does in 5.5.40.
 
- -- Otto Kekäläinen <otto@seravo.fi>  Wed, 12 Oct 2014 01:04:24 +0200
-
-mariadb-5.5 (5.5.39-0ubuntu0.14.04.1) trusty-security; urgency=medium
-
-  * SECURITY UPDATE: Update to 5.5.39 to fix security issues (LP: #1363222)
-    * 5.5.39
-      - Fixes an error when handling MyISAM temporary files can be
-        exploited to execute arbitrary code (Secunia Advisory SA60599)
-    * 5.5.38
-      - CVE-2014-2494
-      - CVE-2014-4207
-      - CVE-2014-4243
-      - CVE-2014-4258
-      - CVE-2014-4260
-  * Import a few important packaging bug fixes available in Debian
-
- -- Otto Kekäläinen <otto@seravo.fi>  Fri, 29 Aug 2014 23:04:24 +0300
-
-mariadb-5.5 (5.5.37-0ubuntu0.14.04.1) trusty-security; urgency=medium
-
-  * SECURITY UPDATE: Update to 5.5.37 to fix security issues (LP: #1313187)
-    - http://www.oracle.com/technetwork/topics/security/cpuapr2014-1972952.html
-    - CVE-2014-0001
-    - CVE-2014-0384
-    - CVE-2014-2419
-    - CVE-2014-2430
-    - CVE-2014-2431
-    - CVE-2014-2432
-    - CVE-2014-2436
-    - CVE-2014-2438
-    - CVE-2014-2440
-
- -- Otto Kekäläinen <otto@seravo.fi>  Mon, 28 Apr 2014 09:55:22 +0300
+ -- Otto Kekäläinen <otto@seravo.fi>  Fri, 14 Nov 2014 21:04:24 +0200
+
+mariadb-5.5 (5.5.39-2) unstable; urgency=low
+
+  * d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
+  * d/control: Removed Provides: libmysqld-dev with same motivation
+  * Re-introduced tha HPPA build patch as the upstream fix wasn't complete
+  * Fixed all kFreeBSD build and test suite issues
+  * Added Italian translation (Closes: #759813)
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Wed, 27 Aug 2014 21:12:36 +0300
+
+mariadb-5.5 (5.5.39-1) unstable; urgency=low
+
+  * New upstream release.
+    * Fixes an error when handling MyISAM temporary files can be
+      exploited to execute arbitrary code (Secunia Advisory SA60599)
+  * Add patch to fix kFreeBSD builds
+  * Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Thu, 07 Aug 2014 12:16:19 +0300
+
+mariadb-5.5 (5.5.38-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added upstream release signing key in preparation for future use
+  * Made libterm-readkey-perl a depends instead of suggest (LP: #1324082)
+  * Add patch to fix HPPA build error (Closes: #751805)
+  * Fixed lots and lots of Lintian warnings
+  * Disabled TokuDB (Closes: #753222). Remember to re-enable if once
+    https://mariadb.atlassian.net/browse/MDEV-6449 is closed.
+  * Add in retrospect corresponding MariaDB CVEs for
+    Oracle SPU July 2014 (Closes: #754940)
+    - CVE-2014-2494
+    - CVE-2014-4207
+    - CVE-2014-4243
+    - CVE-2014-4258
+    - CVE-2014-4260
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Tue, 17 Jun 2014 16:24:35 +0300
+
+mariadb-5.5 (5.5.37-1) unstable; urgency=low
+
+  * New upstream release, fixing the following security issues:
+    * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
+      - CVE-2014-0384
+      - CVE-2014-2419
+      - CVE-2014-2430
+      - CVE-2014-2431
+      - CVE-2014-2432
+      - CVE-2014-2436
+      - CVE-2014-2438
+      - CVE-2014-2440
+  * Re-enabled TokuDB with "if arch amd64" in d/rules
+  * Applied patch to log init output better
+    (Closes https://mariadb.atlassian.net/browse/MDEV-5957)
+
+ -- Otto Kekäläinen <otto@seravo.fi>  Thu, 17 Apr 2014 20:55:22 +0300
 
 mariadb-5.5 (5.5.36-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 3cb324d7d1a6974a6a864dec5b1c17a3182946d0..a7419f93ae3b58e29976308d97eade8fbd0571f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -772,35 +772,30 @@ License: GPL-2
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
  On Debian and systems the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2`
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-2+
- This file is part of GNU Readline, a library for reading lines
- of text with interactive input and history editing.
- .
- Readline is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
- .
- Readline is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
  .
- You should have received a copy of the GNU General Public License
- along with Readline; see the file COPYING.  If not, write to the Free
- Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
  On Debian and systems the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2`
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: LGPL
  This library is free software; you can redistribute it and/or
@@ -877,7 +872,134 @@ License: BSD-4-clause
  POSSIBILITY OF SUCH DAMAGE.
 
 License: Artistic
- See file /usr/share/common-licenses/Artistic
+ 			 The "Artistic License"
+ .
+ 				Preamble
+ .
+ The intent of this document is to state the conditions under which a
+ Package may be copied, such that the Copyright Holder maintains some
+ semblance of artistic control over the development of the package,
+ while giving the users of the package the right to use and distribute
+ the Package in a more-or-less customary fashion, plus the right to make
+ reasonable modifications.
+ .
+ Definitions:
+ .
+ 	"Package" refers to the collection of files distributed by the
+ 	Copyright Holder, and derivatives of that collection of files
+ 	created through textual modification.
+ .
+ 	"Standard Version" refers to such a Package if it has not been
+ 	modified, or has been modified in accordance with the wishes
+ 	of the Copyright Holder as specified below.
+ .
+ 	"Copyright Holder" is whoever is named in the copyright or
+ 	copyrights for the package.
+ .
+ 	"You" is you, if you're thinking about copying or distributing
+ 	this Package.
+ .
+ 	"Reasonable copying fee" is whatever you can justify on the
+ 	basis of media cost, duplication charges, time of people involved,
+ 	and so on.  (You will not be required to justify it to the
+ 	Copyright Holder, but only to the computing community at large
+ 	as a market that must bear the fee.)
+ .
+ 	"Freely Available" means that no fee is charged for the item
+ 	itself, though there may be fees involved in handling the item.
+ 	It also means that recipients of the item may redistribute it
+ 	under the same conditions they received it.
+ .
+ 1. You may make and give away verbatim copies of the source form of the
+ Standard Version of this Package without restriction, provided that you
+ duplicate all of the original copyright notices and associated disclaimers.
+ .
+ 2. You may apply bug fixes, portability fixes and other modifications
+ derived from the Public Domain or from the Copyright Holder.  A Package
+ modified in such a way shall still be considered the Standard Version.
+ .
+ 3. You may otherwise modify your copy of this Package in any way, provided
+ that you insert a prominent notice in each changed file stating how and
+ when you changed that file, and provided that you do at least ONE of the
+ following:
+ .
+     a) place your modifications in the Public Domain or otherwise make them
+     Freely Available, such as by posting said modifications to Usenet or
+     an equivalent medium, or placing the modifications on a major archive
+     site such as uunet.uu.net, or by allowing the Copyright Holder to include
+     your modifications in the Standard Version of the Package.
+ .
+     b) use the modified Package only within your corporation or organization.
+ .
+     c) rename any non-standard executables so the names do not conflict
+     with standard executables, which must also be provided, and provide
+     a separate manual page for each non-standard executable that clearly
+     documents how it differs from the Standard Version.
+ .
+     d) make other distribution arrangements with the Copyright Holder.
+ .
+ 4. You may distribute the programs of this Package in object code or
+ executable form, provided that you do at least ONE of the following:
+ .
+     a) distribute a Standard Version of the executables and library files,
+     together with instructions (in the manual page or equivalent) on where
+     to get the Standard Version.
+ .
+     b) accompany the distribution with the machine-readable source of
+     the Package with your modifications.
+ .
+     c) give non-standard executables non-standard names, and clearly
+     document the differences in manual pages (or equivalent), together
+     with instructions on where to get the Standard Version.
+ .
+     d) make other distribution arrangements with the Copyright Holder.
+ .
+ 5. You may charge a reasonable copying fee for any distribution of this
+ Package.  You may charge any fee you choose for support of this
+ Package.  You may not charge a fee for this Package itself.  However,
+ you may distribute this Package in aggregate with other (possibly
+ commercial) programs as part of a larger (possibly commercial) software
+ distribution provided that you do not advertise this Package as a
+ product of your own.  You may embed this Package's interpreter within
+ an executable of yours (by linking); this shall be construed as a mere
+ form of aggregation, provided that the complete Standard Version of the
+ interpreter is so embedded.
+ .
+ 6. The scripts and library files supplied as input to or produced as
+ output from the programs of this Package do not automatically fall
+ under the copyright of this Package, but belong to whoever generated
+ them, and may be sold commercially, and may be aggregated with this
+ Package.  If such scripts or library files are aggregated with this
+ Package via the so-called "undump" or "unexec" methods of producing a
+ binary executable image, then distribution of such an image shall
+ neither be construed as a distribution of this Package nor shall it
+ fall under the restrictions of Paragraphs 3 and 4, provided that you do
+ not represent such an executable image as a Standard Version of this
+ Package.
+ .
+ 7. C subroutines (or comparably compiled subroutines in other
+ languages) supplied by you and linked into this Package in order to
+ emulate subroutines and variables of the language defined by this
+ Package shall not be considered part of this Package, but are the
+ equivalent of input as in Paragraph 6, provided these subroutines do
+ not change the language in any way that would cause it to fail the
+ regression tests for the language.
+ .
+ 8. Aggregation of this Package with a commercial distribution is always
+ permitted provided that the use of this Package is embedded; that is,
+ when no overt attempt is made to make this Package's interfaces visible
+ to the end user of the commercial distribution.  Such use shall not be
+ construed as a distribution of this Package.
+ .
+ 9. The name of the Copyright Holder may not be used to endorse or promote
+ products derived from this software without specific prior written permission.
+ .
+ 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ 				The End
+
 
 License: public-domain
  The work is public domain (no license).
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..c28ec44fab42febb4ea367077956d691f0e21172
--- /dev/null
+++ b/debian/dist/Debian/control
@@ -0,0 +1,247 @@
+Source: mariadb-5.5
+Section: misc
+Priority: optional
+Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
+XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
+Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
+Standards-Version: 3.8.3
+Homepage: http://mariadb.org/
+Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
+Vcs-Bzr: bzr://lp:maria
+
+Package: libmariadbclient18
+Section: libs
+Architecture: any
+Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
+           mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+Description: MariaDB database client library
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the client library.
+
+Package: libmysqlclient18
+Section: libs
+Architecture: any
+Depends: libmariadbclient18 (= ${source:Version})
+Replaces: libmysqlclient18 (<< ${source:Version})
+Description: Virtual package to satisfy external depends
+ This is an empty package that provides an updated "best" version of
+ libmysqlclient18 that does not conflict with the libmariadbclient18
+ package.
+ .
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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: libmariadbd-dev
+Architecture: any
+Section: libdevel
+Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
+Provides: libmysqld-dev
+Conflicts: libmysqld-dev
+Replaces: libmysqld-dev
+Description: MariaDB embedded database development files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the embedded server library and header files.
+
+Package: libmariadbclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
+Replaces: libmariadbclient16-dev, libmysqlclient16-dev
+Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
+Provides: libmysqlclient-dev
+Description: MariaDB database development files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes development libraries and header files.
+
+Package: mysql-common
+Section: database
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/my.cnf).
+
+Package: mariadb-common
+Section: database
+Architecture: all
+Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends}
+Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/conf.d/mariadb.cnf).
+
+Package: mariadb-client-core-5.5
+Architecture: any
+Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
+    mysql-client-core-5.1, mysql-client-core-5.5,
+    mariadb-client-5.1, mariadb-client-core-5.1,
+    mariadb-client-5.2, mariadb-client-core-5.2,
+    mariadb-client-5.3, mariadb-client-core-5.3
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1, mysql-client-5.5,
+    mysql-client-core-5.1, mysql-client-core-5.5,
+    mariadb-client-5.1, mariadb-client-core-5.1,
+    mariadb-client-5.2, mariadb-client-core-5.2,
+    mariadb-client-5.3, mariadb-client-core-5.3
+Description: MariaDB database core client binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the core client files, as used by Akonadi.
+
+Package: mariadb-client-5.5
+Architecture: any
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
+    mariadb-common, libmariadbclient18 (>= ${source:Version}),
+    mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends},
+    ${shlibs:Depends}, ${misc:Depends}
+Suggests: libterm-readkey-perl
+Provides: virtual-mysql-client, mysql-client,
+    mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
+    mariadb-client (<< ${source:Version}),
+    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
+    mysql-client-5.5,
+    mariadb-client (<< ${source:Version}),
+    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
+Description: MariaDB database client binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the client binaries and the additional tools
+ innotop and mysqlreport.
+
+Package: mariadb-server-core-5.5
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
+Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
+Conflicts: mariadb-server-5.1 (<< 5.1.60),
+    mariadb-server-5.2 (<< 5.2.10),
+    mariadb-server-5.3 (<< 5.3.3),
+    mysql-server-5.0,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Replaces: mariadb-server-5.1 (<< 5.1.60),
+    mariadb-server-5.2 (<< 5.2.10),
+    mariadb-server-5.3 (<< 5.3.3),
+    mysql-server-5.0,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Description: MariaDB database core server files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the core server files, as used by Akonadi.
+
+Package: mariadb-test-5.5
+Section: database
+Architecture: any
+Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
+Conflicts: mariadb-test (<< ${source:Version}),
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
+    mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
+Suggests: patch
+Replaces: mariadb-test (<< ${source:Version}),
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
+Description: MariaDB database regression test suite
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the regression test suite.
+
+Package: mariadb-server-5.5
+Architecture: any
+Suggests: tinyca, mailx, mariadb-test
+Recommends: libhtml-template-perl
+Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
+Provides: mariadb-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mariadb-tokudb-engine-5.5
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mariadb-tokudb-engine-5.5
+Description: MariaDB database server binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the server binaries.
+
+Package: mariadb-server
+Section: database
+Architecture: all
+Depends: mariadb-server-5.5 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database 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
+ maintainers. Install this package if in doubt about which MariaDB
+ version you need. That will install the version recommended by the
+ package maintainers.
+ .
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..0c4f8ea105e144f9c6edd1b346d0c6161c935848
--- /dev/null
+++ b/debian/dist/Ubuntu/control
@@ -0,0 +1,241 @@
+Source: mariadb-5.5
+Section: misc
+Priority: optional
+Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
+XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net>
+Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev
+Standards-Version: 3.8.2
+Homepage: http://mariadb.org/
+Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
+Vcs-Bzr: bzr://lp:maria
+
+Package: libmariadbclient18
+Section: libs
+Architecture: any
+Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
+           mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
+Description: MariaDB database client library
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the client library.
+
+Package: libmysqlclient18
+Section: libs
+Architecture: any
+Depends: libmariadbclient18 (= ${source:Version})
+Replaces: libmysqlclient18 (<< ${source:Version})
+Description: Virtual package to satisfy external depends
+ This is an empty package that provides an updated "best" version of
+ libmysqlclient18 that does not conflict with the libmariadbclient18
+ package.
+ .
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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: libmariadbd-dev
+Architecture: any
+Section: libdevel
+Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
+Provides: libmysqld-dev
+Conflicts: libmysqld-dev
+Replaces: libmysqld-dev
+Description: MariaDB embedded database development files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the embedded server library and header files.
+
+Package: libmariadbclient-dev
+Architecture: any
+Section: libdevel
+Depends: libmariadbclient18 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
+Replaces: libmariadbclient16-dev, libmysqlclient16-dev
+Conflicts: libmysqlclient-dev, libmariadbclient16-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
+Provides: libmysqlclient-dev
+Description: MariaDB database development files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes development libraries and header files.
+
+Package: mysql-common
+Section: database
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/my.cnf).
+
+Package: mariadb-common
+Section: database
+Architecture: all
+Depends: mysql-common, ${shlibs:Depends}, ${misc:Depends}
+Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/conf.d/mariadb.cnf).
+
+Package: mariadb-client-core-5.5
+Architecture: any
+Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
+    mysql-client-core-5.1, mysql-client-core-5.5,
+    mariadb-client-5.1, mariadb-client-core-5.1,
+    mariadb-client-5.2, mariadb-client-core-5.2,
+    mariadb-client-5.3, mariadb-client-core-5.3
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0,
+    mysql-client-5.1, mysql-client-5.5,
+    mysql-client-core-5.1, mysql-client-core-5.5,
+    mariadb-client-5.1, mariadb-client-core-5.1,
+    mariadb-client-5.2, mariadb-client-core-5.2,
+    mariadb-client-5.3, mariadb-client-core-5.3
+Description: MariaDB database core client binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the core client files, as used by Akonadi.
+
+Package: mariadb-client-5.5
+Architecture: any
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202),
+    mariadb-common, libmariadbclient18 (>= ${source:Version}),
+    mariadb-client-core-5.5 (>= ${source:Version}), ${perl:Depends},
+    ${shlibs:Depends}, ${misc:Depends}
+Suggests: libterm-readkey-perl
+Provides: virtual-mysql-client, mysql-client,
+    mysql-client-4.1, mysql-client-5.1, mysql-client-5.5
+Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
+    mariadb-client (<< ${source:Version}),
+    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3, mysql-client-5.5
+Replaces: mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1,
+    mysql-client-5.5,
+    mariadb-client (<< ${source:Version}),
+    mariadb-client-5.1, mariadb-client-5.2, mariadb-client-5.3
+Description: MariaDB database client binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the client binaries and the additional tools
+ innotop and mysqlreport.
+
+Package: mariadb-server-core-5.5
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmariadbclient18 (>= ${binary:Version})
+Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5
+Conflicts: mysql-server-5.0,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Replaces: mysql-server-5.0,
+    mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5,
+    mariadb-server-core-5.1, mariadb-server-core-5.2, mariadb-server-core-5.5
+Description: MariaDB database core server files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the core server files, as used by Akonadi.
+
+Package: mariadb-test-5.5
+Section: database
+Architecture: any
+Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
+Suggests: patch
+Conflicts: mariadb-test (<< ${source:Version}),
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
+    mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
+Replaces: mariadb-test (<< ${source:Version}),
+    mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
+Description: MariaDB database regression test suite
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the regression test suite.
+
+Package: mariadb-server-5.5
+Architecture: any
+Suggests: tinyca, mailx, mariadb-test
+Recommends: libhtml-template-perl
+Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
+Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
+Provides: mariadb-server, mysql-server, virtual-mysql-server
+Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    mariadb-tokudb-engine-5.5
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
+    mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
+    mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
+    libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
+    mariadb-tokudb-engine-5.5
+Description: MariaDB database server binaries
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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.
+ .
+ This package includes the server binaries.
+
+Package: mariadb-server
+Section: database
+Architecture: all
+Depends: mariadb-server-5.5 (= ${source:Version}), ${misc:Depends}
+Description: MariaDB database 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
+ maintainers. Install this package if in doubt about which MariaDB
+ version you need. That will install the version recommended by the
+ package maintainers.
+ .
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ 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/mariadb-server-5.5.files.diff b/debian/dist/Ubuntu/mariadb-server-5.5.files.diff
deleted file mode 100644
index bdd9a4e088a0f236cb85d50bdf8fe17cfc25de86..0000000000000000000000000000000000000000
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-*** mariadb-server-5.5.files	2013-02-28 09:41:43.969994431 +0200
---- ../../mariadb-server-5.5.files	2013-02-28 09:41:43.969994431 +0200
-*************** usr/lib/mysql/plugin/
-*** 2,5 ****
-  usr/lib/libhsclient.so.*
-- etc/apparmor.d/usr.sbin.mysqld
-- usr/share/apport/package-hooks/source_mariadb-5.5.py
-  etc/mysql/debian-start
---- 2,3 ----
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files.in b/debian/dist/Ubuntu/mariadb-server-5.5.files.in
new file mode 100644
index 0000000000000000000000000000000000000000..06a6643d6508983052e31fee5d29db4dd636cd7f
--- /dev/null
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files.in
@@ -0,0 +1,77 @@
+usr/lib/mysql/plugin/ha_innodb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
+usr/lib/mysql/plugin/sphinx.so
+usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/auth_pam.so
+usr/lib/mysql/plugin/semisync_master.so
+usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/handlersocket.so
+usr/lib/mysql/plugin/sql_errlog.so
+usr/lib/mysql/plugin/server_audit.so
+usr/lib/libhsclient.so.*
+etc/apparmor.d/usr.sbin.mysqld
+usr/share/apport/package-hooks/source_mariadb-5.5.py
+etc/mysql/debian-start
+etc/mysql/conf.d/mysqld_safe_syslog.cnf
+usr/bin/msql2mysql
+usr/bin/my_print_defaults
+usr/bin/myisamchk
+usr/bin/myisam_ftdump
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/aria_pack
+usr/bin/aria_read_log
+usr/bin/aria_ftdump
+usr/bin/aria_chk
+usr/bin/aria_dump_log
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_install_db
+usr/bin/mysql_plugin
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_zap
+usr/bin/mysqlbinlog
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolve_stack_dump
+usr/bin/resolveip
+usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
+usr/share/doc/mariadb-server-5.5/INFO_SRC
+usr/share/doc/mariadb-server-5.5/INFO_BIN
+usr/share/lintian/overrides/mariadb-server-5.5
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_secure_installation.1
+usr/share/man/man1/mysql_setpermission.1
+usr/share/man/man1/mysql_upgrade.1
+usr/share/man/man1/mysql_zap.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/mysql_tzinfo_to_sql.1
+usr/share/mysql/debian-start.inc.sh
+usr/share/mysql/echo_stderr
+usr/share/mysql/errmsg-utf8.txt
+usr/share/mysql/fill_help_tables.sql
+usr/share/mysql/mysql_system_tables_data.sql
+usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_performance_tables.sql
+usr/share/mysql/mysql_test_data_timezone.sql
+@TOKUDB_DEB_FILES@
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.postinst.diff b/debian/dist/Ubuntu/mariadb-server-5.5.postinst.diff
deleted file mode 100644
index 0c36048123001a3cdd94422bba1ec6ef359ea81e..0000000000000000000000000000000000000000
--- a/debian/dist/Ubuntu/mariadb-server-5.5.postinst.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-*** mariadb-server-5.5.postinst	2013-02-28 09:41:43.969994431 +0200
---- ../../mariadb-server-5.5.postinst	2013-02-28 09:41:43.969994431 +0200
-*************** set_mysql_rootpw() {
-*** 33,35 ****
-         db_set mysql-server/root_password ""
--        db_set mysql-server/root_password_again ""
-  
---- 33,34 ----
-*************** EOF
-*** 215,217 ****
-          "USE mysql;\n" \
-!         "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-          "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
---- 214,216 ----
-          "USE mysql;\n" \
-!         "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-          "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
-*************** EOF
-*** 231,247 ****
-      set -e
-- 
--     # If there is a real AppArmor profile, we reload it.
--     # If the default empty profile is installed, then we remove any old
--     # profile that may be loaded.
--     # This allows upgrade from old versions (that have an apparmor profile
--     # on by default) to work both to disable a default profile, and to keep
--     # any profile installed and maintained by users themselves.
--     profile="/etc/apparmor.d/usr.sbin.mysqld"
--     if [ -f "$profile" ] && aa-status --enabled 2>/dev/null; then
--         if grep -q /usr/sbin/mysqld "$profile" 2>/dev/null ; then
--             apparmor_parser -r "$profile" || true
--         else
--             echo "/usr/sbin/mysqld { }" | apparmor_parser --remove 2>/dev/null || true
-- 	fi
--     fi
-    ;;
---- 230,231 ----
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.postrm.diff b/debian/dist/Ubuntu/mariadb-server-5.5.postrm.diff
deleted file mode 100644
index 0806382e12028ffa241f5c98863650c6baf1bd56..0000000000000000000000000000000000000000
--- a/debian/dist/Ubuntu/mariadb-server-5.5.postrm.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-*** mariadb-server-5.5.postrm	2013-02-28 09:41:43.969994431 +0200
---- ../../mariadb-server-5.5.postrm	2013-02-28 09:41:43.969994431 +0200
-*************** fi
-*** 80,84 ****
-  
-- if [ "$1" = "purge" ] ; then
--      rm -f /etc/apparmor.d/force-complain/usr.sbin.mysqld >/dev/null 2>&1 || true
-- fi
-  # no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed
---- 80,81 ----
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000000000000000000000000000000000000..bd69fd3a833fa0f4e23fc53c229c92a7b65fe6ab
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = master
+pristine-tar = True
diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install
index b18f2d5df8c194f77b3911cc07bb075717e734d1..4e4ad0aabf66e636f6fa9a6030d893529b1723d4 100644
--- a/debian/libmariadbclient-dev.install
+++ b/debian/libmariadbclient-dev.install
@@ -1,6 +1,8 @@
 usr/bin/mysql_config
-usr/include/mysql
+usr/include/mysql/*
 usr/lib/*/libmariadbclient.a
+usr/lib/*/libmariadbclient.so
 usr/lib/*/libmariadbclient_r.a
+usr/lib/*/libmariadbclient_r.so*
 usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
diff --git a/debian/libmariadbclient-dev.lintian-overrides b/debian/libmariadbclient-dev.lintian-overrides
deleted file mode 100644
index ea9a8d92635b78c5beeb5b05d3cc05754898a5fa..0000000000000000000000000000000000000000
--- a/debian/libmariadbclient-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# OK, newer Debian should support xz
-libmariadbclient-dev: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/libmariadbclient18.lintian-overrides b/debian/libmariadbclient18.lintian-overrides
index 6252cc1ca9f0fb59e60f999ecf0db257b4ce985a..06b348c41afd07b5377685d67af1ec2bf782c7d1 100644
--- a/debian/libmariadbclient18.lintian-overrides
+++ b/debian/libmariadbclient18.lintian-overrides
@@ -1,7 +1,5 @@
-# Ok as long as file names don't conflict with the MySQL version
+# OK, file names don't conflict with the MySQL version
 libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/dialog.so
 libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/mysql_clear_password.so
 # embedded libs are OK
 libmariadbclient18: embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
-# OK, newer Debian should support xz
-libmariadbclient18: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/libmariadbclient18.symbols b/debian/libmariadbclient18.symbols
index 9a913229b4d46fea5fd268205c5026320ae922df..fb04895ce6669cd598f947576a5cca739bb0c519 100644
--- a/debian/libmariadbclient18.symbols
+++ b/debian/libmariadbclient18.symbols
@@ -2,1341 +2,377 @@ dialog.so libmariadbclient18 #MINVER#
  _mysql_client_plugin_declaration_@Base 5.5.35
  get_tty_password_buff@Base 5.5.35
 libmariadbclient.so.18 libmariadbclient18 #MINVER#
-#MISSING: 5.5.36# PSI_hook@Base 5.5.35
-#MISSING: 5.5.36# PSI_server@Base 5.5.35
-#MISSING: 5.5.36# THR_COND_threads@Base 5.5.35
-#MISSING: 5.5.36# THR_KEY_mysys@Base 5.5.35
  THR_KEY_mysys@libmariadbclient_16 5.5.36
  THR_KEY_mysys@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# THR_LOCK_charset@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_heap@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_isam@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_lock@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_malloc@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_myisam@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_myisam_mmap@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_net@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_open@Base 5.5.35
-#MISSING: 5.5.36# THR_LOCK_threads@Base 5.5.35
-#MISSING: 5.5.36# THR_thread_count@Base 5.5.35
-#MISSING: 5.5.36# TIME_to_double@Base 5.5.35
-#MISSING: 5.5.36# TIME_to_ulonglong@Base 5.5.35
-#MISSING: 5.5.36# TIME_to_ulonglong_date@Base 5.5.35
-#MISSING: 5.5.36# TIME_to_ulonglong_datetime@Base 5.5.35
-#MISSING: 5.5.36# TIME_to_ulonglong_time@Base 5.5.35
-#MISSING: 5.5.36# _dig_vec_lower@Base 5.5.35
-#MISSING: 5.5.36# _dig_vec_upper@Base 5.5.35
-#MISSING: 5.5.36# _my_sig_remember@Base 5.5.35
-#MISSING: 5.5.36# _my_signals@Base 5.5.35
-#MISSING: 5.5.36# _my_thread_var@Base 5.5.35
-#MISSING: 5.5.36# add_compiled_collation@Base 5.5.35
-#MISSING: 5.5.36# all_charsets@Base 5.5.35
-#MISSING: 5.5.36# alloc_dynamic@Base 5.5.35
- alloc_dynamic@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# alloc_root@Base 5.5.35
- alloc_root@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# allocate_dynamic@Base 5.5.35
-#MISSING: 5.5.36# array_append_string_unique@Base 5.5.35
-#MISSING: 5.5.36# bchange@Base 5.5.35
-#MISSING: 5.5.36# bin2decimal@Base 5.5.35
-#MISSING: 5.5.36# bmove_upp@Base 5.5.35
-#MISSING: 5.5.36# calc_daynr@Base 5.5.35
-#MISSING: 5.5.36# calc_days_in_year@Base 5.5.35
-#MISSING: 5.5.36# cant_connect_sqlstate@Base 5.5.35
-#MISSING: 5.5.36# charsets@Base 5.5.35
-#MISSING: 5.5.36# charsets_dir@Base 5.5.35
-#MISSING: 5.5.36# check_date@Base 5.5.35
-#MISSING: 5.5.36# check_scramble@Base 5.5.35
-#MISSING: 5.5.36# check_scramble_323@Base 5.5.35
-#MISSING: 5.5.36# check_time_range@Base 5.5.35
-#MISSING: 5.5.36# cleanup_dirname@Base 5.5.35
-#MISSING: 5.5.36# cli_advanced_command@Base 5.5.35
-#MISSING: 5.5.36# cli_list_fields@Base 5.5.35
-#MISSING: 5.5.36# cli_read_binary_rows@Base 5.5.35
-#MISSING: 5.5.36# cli_read_change_user_result@Base 5.5.35
-#MISSING: 5.5.36# cli_read_prepare_result@Base 5.5.35
-#MISSING: 5.5.36# cli_read_rows@Base 5.5.35
-#MISSING: 5.5.36# cli_read_statistics@Base 5.5.35
-#MISSING: 5.5.36# cli_safe_read@Base 5.5.35
-#MISSING: 5.5.36# cli_stmt_execute@Base 5.5.35
-#MISSING: 5.5.36# cli_unbuffered_fetch@Base 5.5.35
-#MISSING: 5.5.36# client_errors@Base 5.5.35
+ alloc_dynamic@libmariadbclient_18 5.5.37
+ alloc_root@libmariadbclient_18 5.5.37
  client_errors@libmariadbclient_16 5.5.36
  client_errors@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# compiled_charsets@Base 5.5.35
-#MISSING: 5.5.36# convert_dirname@Base 5.5.35
-#MISSING: 5.5.36# copy_typelib@Base 5.5.35
-#MISSING: 5.5.36# create_random_string@Base 5.5.35
-#MISSING: 5.5.36# curr_dir@Base 5.5.35
-#MISSING: 5.5.36# days_in_month@Base 5.5.35
-#MISSING: 5.5.36# debug_sync_C_callback_ptr@Base 5.5.35
-#MISSING: 5.5.36# decimal2bin@Base 5.5.35
-#MISSING: 5.5.36# decimal2double@Base 5.5.35
-#MISSING: 5.5.36# decimal2longlong@Base 5.5.35
-#MISSING: 5.5.36# decimal2string@Base 5.5.35
-#MISSING: 5.5.36# decimal2ulonglong@Base 5.5.35
-#MISSING: 5.5.36# decimal_actual_fraction@Base 5.5.35
-#MISSING: 5.5.36# decimal_add@Base 5.5.35
-#MISSING: 5.5.36# decimal_bin_size@Base 5.5.35
-#MISSING: 5.5.36# decimal_cmp@Base 5.5.35
-#MISSING: 5.5.36# decimal_div@Base 5.5.35
-#MISSING: 5.5.36# decimal_intg@Base 5.5.35
-#MISSING: 5.5.36# decimal_is_zero@Base 5.5.35
-#MISSING: 5.5.36# decimal_mod@Base 5.5.35
-#MISSING: 5.5.36# decimal_mul@Base 5.5.35
-#MISSING: 5.5.36# decimal_result_size@Base 5.5.35
-#MISSING: 5.5.36# decimal_round@Base 5.5.35
-#MISSING: 5.5.36# decimal_shift@Base 5.5.35
-#MISSING: 5.5.36# decimal_size@Base 5.5.35
-#MISSING: 5.5.36# decimal_sub@Base 5.5.35
-#MISSING: 5.5.36# default_charset_info@Base 5.5.35
  default_charset_info@libmariadbclient_16 5.5.36
  default_charset_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# default_client_charset_info@Base 5.5.35
-#MISSING: 5.5.36# delete_dynamic@Base 5.5.35
- delete_dynamic@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# delete_dynamic_element@Base 5.5.35
-#MISSING: 5.5.36# directory_file_name@Base 5.5.35
-#MISSING: 5.5.36# dirname_length@Base 5.5.35
-#MISSING: 5.5.36# dirname_part@Base 5.5.35
-#MISSING: 5.5.36# disabled_my_option@Base 5.5.35
-#MISSING: 5.5.36# do_mini_left_shift@Base 5.5.35
-#MISSING: 5.5.36# do_mini_right_shift@Base 5.5.35
-#MISSING: 5.5.36# double2decimal@Base 5.5.35
-#MISSING: 5.5.36# dynamic_column_create@Base 5.5.35
+ delete_dynamic@libmariadbclient_18 5.5.37
  dynamic_column_create@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_create_many@Base 5.5.35
  dynamic_column_create_many@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_delete@Base 5.5.35
  dynamic_column_delete@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_exists@Base 5.5.35
  dynamic_column_exists@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_get@Base 5.5.35
  dynamic_column_get@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_list@Base 5.5.35
  dynamic_column_list@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_prepare_decimal@Base 5.5.35
  dynamic_column_prepare_decimal@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_update@Base 5.5.35
  dynamic_column_update@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynamic_column_update_many@Base 5.5.35
  dynamic_column_update_many@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# dynstr_append@Base 5.5.35
- dynstr_append@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# dynstr_append_mem@Base 5.5.35
- dynstr_append_mem@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# dynstr_append_os_quoted@Base 5.5.35
- dynstr_append_os_quoted@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# dynstr_free@Base 5.5.35
- dynstr_free@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# dynstr_realloc@Base 5.5.35
- dynstr_realloc@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# dynstr_reassociate@Base 5.5.35
-#MISSING: 5.5.36# dynstr_set@Base 5.5.35
-#MISSING: 5.5.36# dynstr_trunc@Base 5.5.35
-#MISSING: 5.5.36# enabled_my_option@Base 5.5.35
-#MISSING: 5.5.36# end_server@Base 5.5.35
-#MISSING: 5.5.36# error_handler_hook@Base 5.5.35
-#MISSING: 5.5.36# escape_quotes_for_mysql@Base 5.5.35
-#MISSING: 5.5.36# escape_string_for_mysql@Base 5.5.35
-#MISSING: 5.5.36# fastmutex_global_init@Base 5.5.35
-#MISSING: 5.5.36# fatal_error_handler_hook@Base 5.5.35
-#MISSING: 5.5.36# find_set_from_flags@Base 5.5.35
-#MISSING: 5.5.36# find_type@Base 5.5.35
-#MISSING: 5.5.36# find_type_or_exit@Base 5.5.35
-#MISSING: 5.5.36# find_type_with_warning@Base 5.5.35
-#MISSING: 5.5.36# find_typeset@Base 5.5.35
-#MISSING: 5.5.36# finish_client_errs@Base 5.5.35
-#MISSING: 5.5.36# flush_one_result@Base 5.5.35
-#MISSING: 5.5.36# fn_ext@Base 5.5.35
-#MISSING: 5.5.36# fn_format@Base 5.5.35
-#MISSING: 5.5.36# free_charsets@Base 5.5.35
-#MISSING: 5.5.36# free_defaults@Base 5.5.35
+ dynstr_append@libmariadbclient_18 5.5.37
+ dynstr_append_mem@libmariadbclient_18 5.5.37
+ dynstr_append_os_quoted@libmariadbclient_18 5.5.37
+ dynstr_free@libmariadbclient_18 5.5.37
+ dynstr_realloc@libmariadbclient_18 5.5.37
  free_defaults@libmariadbclient_16 5.5.36
  free_defaults@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# free_old_query@Base 5.5.35
-#MISSING: 5.5.36# free_root@Base 5.5.35
- free_root@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# free_rows@Base 5.5.35
-#MISSING: 5.5.36# free_vio_ssl_acceptor_fd@Base 5.5.35
-#MISSING: 5.5.36# freeze_size@Base 5.5.35
-#MISSING: 5.5.36# get_charset@Base 5.5.35
+ free_root@libmariadbclient_18 5.5.37
  get_charset@libmariadbclient_16 5.5.36
  get_charset@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# get_charset_by_csname@Base 5.5.35
  get_charset_by_csname@libmariadbclient_16 5.5.36
  get_charset_by_csname@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# get_charset_by_name@Base 5.5.35
-#MISSING: 5.5.36# get_charset_name@Base 5.5.35
-#MISSING: 5.5.36# get_charset_number@Base 5.5.35
-#MISSING: 5.5.36# get_charsets_dir@Base 5.5.35
-#MISSING: 5.5.36# get_client_errmsgs@Base 5.5.35
-#MISSING: 5.5.36# get_collation_number@Base 5.5.35
-#MISSING: 5.5.36# get_defaults_options@Base 5.5.35
-#MISSING: 5.5.36# get_dynamic@Base 5.5.35
- get_dynamic@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# get_global_errmsgs@Base 5.5.35
-#MISSING: 5.5.36# get_index_dynamic@Base 5.5.35
-#MISSING: 5.5.36# get_salt_from_password@Base 5.5.35
-#MISSING: 5.5.36# get_salt_from_password_323@Base 5.5.35
-#MISSING: 5.5.36# get_tty_password@Base 5.5.35
+ get_dynamic@libmariadbclient_18 5.5.37
  get_tty_password@libmariadbclient_16 5.5.36
  get_tty_password@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# get_tty_password_buff@Base 5.5.35
-#MISSING: 5.5.36# get_type@Base 5.5.35
-#MISSING: 5.5.36# getopt_compare_strings@Base 5.5.35
-#MISSING: 5.5.36# getopt_double2ulonglong@Base 5.5.35
-#MISSING: 5.5.36# getopt_double_limit_value@Base 5.5.35
-#MISSING: 5.5.36# getopt_ll_limit_value@Base 5.5.35
-#MISSING: 5.5.36# getopt_ull_limit_value@Base 5.5.35
-#MISSING: 5.5.36# getopt_ulonglong2double@Base 5.5.35
-#MISSING: 5.5.36# globerrs@Base 5.5.35
-#MISSING: 5.5.36# handle_local_infile@Base 5.5.35
-#MISSING: 5.5.36# handle_options@Base 5.5.35
  handle_options@libmariadbclient_16 5.5.36
  handle_options@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# has_path@Base 5.5.35
-#MISSING: 5.5.36# hash_password@Base 5.5.35
-#MISSING: 5.5.36# home_dir@Base 5.5.35
-#MISSING: 5.5.36# home_dir_buff@Base 5.5.35
-#MISSING: 5.5.36# init_alloc_root@Base 5.5.35
-#MISSING: 5.5.36# init_client_errs@Base 5.5.35
-#MISSING: 5.5.36# init_compiled_charsets@Base 5.5.35
-#MISSING: 5.5.36# init_dynamic_array2@Base 5.5.35
- init_dynamic_array2@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# init_dynamic_array@Base 5.5.35
-#MISSING: 5.5.36# init_dynamic_string@Base 5.5.35
- init_dynamic_string@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# init_glob_errs@Base 5.5.35
-#MISSING: 5.5.36# insert_dynamic@Base 5.5.35
-#MISSING: 5.5.36# int10_to_str@Base 5.5.35
-#MISSING: 5.5.36# int2str@Base 5.5.35
- int2str@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# intern_filename@Base 5.5.35
-#MISSING: 5.5.36# internal_str2dec@Base 5.5.35
-#MISSING: 5.5.36# is_prefix@Base 5.5.35
+ init_dynamic_array2@libmariadbclient_18 5.5.37
+ init_dynamic_string@libmariadbclient_18 5.5.37
+ int2str@libmariadbclient_18 5.5.37
  is_prefix@libmariadbclient_16 5.5.36
  is_prefix@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# key_BITMAP_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_COND_alarm@Base 5.5.35
-#MISSING: 5.5.36# key_IO_CACHE_SHARE_cond@Base 5.5.35
-#MISSING: 5.5.36# key_IO_CACHE_SHARE_cond_writer@Base 5.5.35
-#MISSING: 5.5.36# key_IO_CACHE_SHARE_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_IO_CACHE_append_buffer_lock@Base 5.5.35
-#MISSING: 5.5.36# key_KEY_CACHE_cache_lock@Base 5.5.35
-#MISSING: 5.5.36# key_LOCK_alarm@Base 5.5.35
-#MISSING: 5.5.36# key_LOCK_uuid_generator@Base 5.5.35
-#MISSING: 5.5.36# key_SAFEHASH_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_THR_COND_threads@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_charset@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_heap@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_isam@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_lock@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_malloc@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_myisam@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_myisam_mmap@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_net@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_open@Base 5.5.35
-#MISSING: 5.5.36# key_THR_LOCK_threads@Base 5.5.35
-#MISSING: 5.5.36# key_TMPDIR_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_WT_RESOURCE_cond@Base 5.5.35
-#MISSING: 5.5.36# key_file_charset@Base 5.5.35
-#MISSING: 5.5.36# key_file_cnf@Base 5.5.35
-#MISSING: 5.5.36# key_file_proc_meminfo@Base 5.5.35
-#MISSING: 5.5.36# key_my_thread_var_mutex@Base 5.5.35
-#MISSING: 5.5.36# key_my_thread_var_suspend@Base 5.5.35
  libmariadbclient_16@libmariadbclient_16 5.5.36
  libmariadbclient_18@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# libmysql_api_funcs@Base 5.5.35
-#MISSING: 5.5.36# list_add@Base 5.5.35
- list_add@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# list_cons@Base 5.5.35
-#MISSING: 5.5.36# list_delete@Base 5.5.35
- list_delete@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# list_free@Base 5.5.35
-#MISSING: 5.5.36# list_length@Base 5.5.35
-#MISSING: 5.5.36# list_reverse@Base 5.5.35
-#MISSING: 5.5.36# list_walk@Base 5.5.35
-#MISSING: 5.5.36# llstr@Base 5.5.35
-#MISSING: 5.5.36# load_defaults@Base 5.5.35
+ list_add@libmariadbclient_18 5.5.37
+ list_delete@libmariadbclient_18 5.5.37
  load_defaults@libmariadbclient_16 5.5.36
  load_defaults@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# log_10_int@Base 5.5.35
-#MISSING: 5.5.36# longlong2decimal@Base 5.5.35
-#MISSING: 5.5.36# make_password_from_salt@Base 5.5.35
-#MISSING: 5.5.36# make_password_from_salt_323@Base 5.5.35
-#MISSING: 5.5.36# make_scrambled_password@Base 5.5.35
- make_scrambled_password@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# make_scrambled_password_323@Base 5.5.35
- make_scrambled_password_323@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# make_type@Base 5.5.35
-#MISSING: 5.5.36# mariadb_connection@Base 5.5.35
-#MISSING: 5.5.36# max_allowed_packet@Base 5.5.35
-#MISSING: 5.5.36# max_decimal@Base 5.5.35
-#MISSING: 5.5.36# memdup_root@Base 5.5.35
-#MISSING: 5.5.36# mpvio_info@Base 5.5.35
-#MISSING: 5.5.36# multi_alloc_root@Base 5.5.35
-#MISSING: 5.5.36# my_TIME_to_str@Base 5.5.35
-#MISSING: 5.5.36# my_abort_hook@Base 5.5.35
-#MISSING: 5.5.36# my_assert_on_error@Base 5.5.35
-#MISSING: 5.5.36# my_atof@Base 5.5.35
-#MISSING: 5.5.36# my_az_allocator@Base 5.5.35
-#MISSING: 5.5.36# my_az_free@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_mb@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_mb_varlen@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_str_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_str_mb@Base 5.5.35
-#MISSING: 5.5.36# my_casedn_ujis@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_mb@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_mb_varlen@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_str_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_str_mb@Base 5.5.35
-#MISSING: 5.5.36# my_caseup_ujis@Base 5.5.35
-#MISSING: 5.5.36# my_charpos_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_charpos_mb@Base 5.5.35
-#MISSING: 5.5.36# my_charset_8bit_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_big5_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_big5_chinese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_bin@Base 5.5.35
- my_charset_bin@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_charset_cp1250_czech_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_cp932_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_cp932_japanese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_eucjpms_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_eucjpms_japanese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_euckr_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_euckr_korean_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_filename@Base 5.5.35
-#MISSING: 5.5.36# my_charset_gb2312_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_gb2312_chinese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_gbk_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_gbk_chinese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_is_8bit_pure_ascii@Base 5.5.35
-#MISSING: 5.5.36# my_charset_is_ascii_based@Base 5.5.35
-#MISSING: 5.5.36# my_charset_is_ascii_compatible@Base 5.5.35
-#MISSING: 5.5.36# my_charset_latin1@Base 5.5.35
- my_charset_latin1@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_charset_latin1_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_latin1_german2_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_latin2_czech_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_repertoire@Base 5.5.35
-#MISSING: 5.5.36# my_charset_same@Base 5.5.35
-#MISSING: 5.5.36# my_charset_sjis_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_sjis_japanese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_tis620_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_tis620_thai_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_croatian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_czech_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_danish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_esperanto_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_estonian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_general_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_general_mysql500_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_hungarian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_icelandic_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_latvian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_lithuanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_persian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_polish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_roman_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_romanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_sinhala_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_slovak_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_slovenian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_spanish2_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_spanish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_swedish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_turkish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ucs2_unicode_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ujis_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_ujis_japanese_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_croatian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_czech_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_danish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_esperanto_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_estonian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_general_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_hungarian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_icelandic_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_latvian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_lithuanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_persian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_polish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_roman_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_romanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_sinhala_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_slovak_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_slovenian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_spanish2_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_spanish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_swedish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_turkish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf16_unicode_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_croatian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_czech_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_danish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_esperanto_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_estonian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_general_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_hungarian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_icelandic_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_latvian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_lithuanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_persian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_polish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_roman_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_romanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_sinhala_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_slovak_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_slovenian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_spanish2_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_spanish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_swedish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_turkish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf32_unicode_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_croatian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_czech_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_danish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_esperanto_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_estonian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_general_ci@Base 5.5.35
- my_charset_utf8_general_ci@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_charset_utf8_general_mysql500_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_hungarian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_icelandic_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_latvian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_lithuanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_persian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_polish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_roman_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_romanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_sinhala_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_slovak_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_slovenian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_spanish2_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_spanish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_swedish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_turkish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8_unicode_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_bin@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_croatian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_czech_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_danish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_esperanto_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_estonian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_general_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_handler@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_hungarian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_icelandic_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_latvian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_lithuanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_persian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_polish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_roman_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_romanian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_sinhala_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_slovak_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_slovenian_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_spanish2_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_spanish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_swedish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_turkish_uca_ci@Base 5.5.35
-#MISSING: 5.5.36# my_charset_utf8mb4_unicode_ci@Base 5.5.35
-#MISSING: 5.5.36# my_cleanup_options@Base 5.5.35
-#MISSING: 5.5.36# my_close@Base 5.5.35
-#MISSING: 5.5.36# my_collation_8bit_bin_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_8bit_simple_ci_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_any_uca_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_mb_bin_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_ucs2_uca_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_utf16_uca_handler@Base 5.5.35
-#MISSING: 5.5.36# my_collation_utf32_uca_handler@Base 5.5.35
-#MISSING: 5.5.36# my_compress@Base 5.5.35
-#MISSING: 5.5.36# my_compress_alloc@Base 5.5.35
-#MISSING: 5.5.36# my_compress_buffer@Base 5.5.35
-#MISSING: 5.5.36# my_connect@Base 5.5.35
-#MISSING: 5.5.36# my_connect_async@Base 5.5.35
-#MISSING: 5.5.36# my_context_continue@Base 5.5.35
-#MISSING: 5.5.36# my_context_destroy@Base 5.5.35
-#MISSING: 5.5.36# my_context_init@Base 5.5.35
-#MISSING: 5.5.36# my_context_install_suspend_resume_hook@Base 5.5.35
-#MISSING: 5.5.36# my_context_spawn@Base 5.5.35
-#MISSING: 5.5.36# my_context_yield@Base 5.5.35
-#MISSING: 5.5.36# my_cs_can_be_contraction_head@Base 5.5.35
-#MISSING: 5.5.36# my_cs_can_be_contraction_tail@Base 5.5.35
-#MISSING: 5.5.36# my_cs_contraction2_weight@Base 5.5.35
-#MISSING: 5.5.36# my_cs_have_contractions@Base 5.5.35
-#MISSING: 5.5.36# my_date_to_str@Base 5.5.35
-#MISSING: 5.5.36# my_datetime_to_str@Base 5.5.35
-#MISSING: 5.5.36# my_default_record_cache_size@Base 5.5.35
-#MISSING: 5.5.36# my_defaults_extra_file@Base 5.5.35
-#MISSING: 5.5.36# my_defaults_file@Base 5.5.35
-#MISSING: 5.5.36# my_defaults_group_suffix@Base 5.5.35
-#MISSING: 5.5.36# my_dir@Base 5.5.35
-#MISSING: 5.5.36# my_dirend@Base 5.5.35
-#MISSING: 5.5.36# my_disable_async_io@Base 5.5.35
-#MISSING: 5.5.36# my_disable_flush_key_blocks@Base 5.5.35
-#MISSING: 5.5.36# my_disable_locking@Base 5.5.35
-#MISSING: 5.5.36# my_disable_symlinks@Base 5.5.35
-#MISSING: 5.5.36# my_disable_sync@Base 5.5.35
-#MISSING: 5.5.36# my_dont_interrupt@Base 5.5.35
-#MISSING: 5.5.36# my_end@Base 5.5.35
- my_end@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_error@Base 5.5.35
-#MISSING: 5.5.36# my_error_register@Base 5.5.35
-#MISSING: 5.5.36# my_error_unregister@Base 5.5.35
-#MISSING: 5.5.36# my_error_unregister_all@Base 5.5.35
-#MISSING: 5.5.36# my_errorcheck_mutexattr@Base 5.5.35
-#MISSING: 5.5.36# my_fast_mutexattr@Base 5.5.35
-#MISSING: 5.5.36# my_fclose@Base 5.5.35
-#MISSING: 5.5.36# my_fcvt@Base 5.5.35
-#MISSING: 5.5.36# my_fdopen@Base 5.5.35
-#MISSING: 5.5.36# my_file_info@Base 5.5.35
-#MISSING: 5.5.36# my_file_info_default@Base 5.5.35
-#MISSING: 5.5.36# my_file_limit@Base 5.5.35
-#MISSING: 5.5.36# my_file_opened@Base 5.5.35
-#MISSING: 5.5.36# my_file_total_opened@Base 5.5.35
-#MISSING: 5.5.36# my_filename@Base 5.5.35
-#MISSING: 5.5.36# my_fileno@Base 5.5.35
-#MISSING: 5.5.36# my_fill_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_fopen@Base 5.5.35
-#MISSING: 5.5.36# my_fprintf@Base 5.5.35
-#MISSING: 5.5.36# my_fread@Base 5.5.35
-#MISSING: 5.5.36# my_free@Base 5.5.35
- my_free@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_freopen@Base 5.5.35
-#MISSING: 5.5.36# my_fseek@Base 5.5.35
-#MISSING: 5.5.36# my_fstat@Base 5.5.35
-#MISSING: 5.5.36# my_ftell@Base 5.5.35
-#MISSING: 5.5.36# my_fwrite@Base 5.5.35
-#MISSING: 5.5.36# my_gcvt@Base 5.5.35
-#MISSING: 5.5.36# my_getcputime@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_error_reporter@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_is_args_separator@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_print_errors@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_register_get_addr@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_skip_unknown@Base 5.5.35
-#MISSING: 5.5.36# my_getopt_use_args_separator@Base 5.5.35
-#MISSING: 5.5.36# my_getwd@Base 5.5.35
-#MISSING: 5.5.36# my_global_flags@Base 5.5.35
-#MISSING: 5.5.36# my_hash_sort_8bit_bin@Base 5.5.35
-#MISSING: 5.5.36# my_hash_sort_bin@Base 5.5.35
-#MISSING: 5.5.36# my_hash_sort_latin1_de@Base 5.5.35
-#MISSING: 5.5.36# my_hash_sort_mb_bin@Base 5.5.35
-#MISSING: 5.5.36# my_hash_sort_simple@Base 5.5.35
-#MISSING: 5.5.36# my_have_got_alarm@Base 5.5.35
-#MISSING: 5.5.36# my_hrtime@Base 5.5.35
-#MISSING: 5.5.36# my_init@Base 5.5.35
+ make_scrambled_password@libmariadbclient_18 5.5.37
+ make_scrambled_password_323@libmariadbclient_18 5.5.37
+ my_charset_bin@libmariadbclient_18 5.5.38
+ my_charset_latin1@libmariadbclient_18 5.5.38
+ my_charset_utf8_general_ci@libmariadbclient_18 5.5.38
+ my_end@libmariadbclient_18 5.5.37
+ my_free@libmariadbclient_18 5.5.37
  my_init@libmariadbclient_16 5.5.36
  my_init@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# my_init_done@Base 5.5.35
-#MISSING: 5.5.36# my_init_mysys_psi_keys@Base 5.5.35
-#MISSING: 5.5.36# my_init_time@Base 5.5.35
-#MISSING: 5.5.36# my_instr_mb@Base 5.5.35
-#MISSING: 5.5.36# my_instr_simple@Base 5.5.35
-#MISSING: 5.5.36# my_interval_timer@Base 5.5.35
-#MISSING: 5.5.36# my_is_symlink@Base 5.5.35
-#MISSING: 5.5.36# my_large_page_size@Base 5.5.35
-#MISSING: 5.5.36# my_lengthsp_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_lengthsp_binary@Base 5.5.35
-#MISSING: 5.5.36# my_like_range_generic@Base 5.5.35
-#MISSING: 5.5.36# my_like_range_mb@Base 5.5.35
-#MISSING: 5.5.36# my_like_range_simple@Base 5.5.35
-#MISSING: 5.5.36# my_load_defaults@Base 5.5.35
-#MISSING: 5.5.36# my_load_path@Base 5.5.35
-#MISSING: 5.5.36# my_long10_to_str_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_longlong10_to_str_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_make_scrambled_password@Base 5.5.35
  my_make_scrambled_password@libmariadbclient_16 5.5.36
  my_make_scrambled_password@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# my_make_scrambled_password_323@Base 5.5.35
-#MISSING: 5.5.36# my_malloc@Base 5.5.35
- my_malloc@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_mb_ctype_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_mb_ctype_mb@Base 5.5.35
-#MISSING: 5.5.36# my_mb_wc_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_mbcharlen_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_memdup@Base 5.5.35
- my_memdup@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_message@Base 5.5.35
-#MISSING: 5.5.36# my_message_stderr@Base 5.5.35
-#MISSING: 5.5.36# my_multi_malloc@Base 5.5.35
-#MISSING: 5.5.36# my_mutex_end@Base 5.5.35
-#MISSING: 5.5.36# my_mutex_init@Base 5.5.35
-#MISSING: 5.5.36# my_net_init@Base 5.5.35
-#MISSING: 5.5.36# my_net_local_init@Base 5.5.35
-#MISSING: 5.5.36# my_net_read@Base 5.5.35
-#MISSING: 5.5.36# my_net_set_read_timeout@Base 5.5.35
-#MISSING: 5.5.36# my_net_set_write_timeout@Base 5.5.35
-#MISSING: 5.5.36# my_net_write@Base 5.5.35
-#MISSING: 5.5.36# my_numcells_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_numcells_mb@Base 5.5.35
-#MISSING: 5.5.36# my_numchars_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_numchars_mb@Base 5.5.35
-#MISSING: 5.5.36# my_once_alloc@Base 5.5.35
-#MISSING: 5.5.36# my_once_extra@Base 5.5.35
-#MISSING: 5.5.36# my_once_free@Base 5.5.35
-#MISSING: 5.5.36# my_once_memdup@Base 5.5.35
-#MISSING: 5.5.36# my_once_root_block@Base 5.5.35
-#MISSING: 5.5.36# my_once_strdup@Base 5.5.35
-#MISSING: 5.5.36# my_open@Base 5.5.35
-#MISSING: 5.5.36# my_parse_charset_xml@Base 5.5.35
-#MISSING: 5.5.36# my_pipe_sig_handler@Base 5.5.35
-#MISSING: 5.5.36# my_poll_read_async@Base 5.5.35
-#MISSING: 5.5.36# my_print_default_files@Base 5.5.35
-#MISSING: 5.5.36# my_print_help@Base 5.5.35
+ my_malloc@libmariadbclient_18 5.5.37
+ my_memdup@libmariadbclient_18 5.5.37
  my_print_help@libmariadbclient_16 5.5.36
  my_print_help@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# my_print_variables@Base 5.5.35
-#MISSING: 5.5.36# my_printf_error@Base 5.5.35
-#MISSING: 5.5.36# my_printv_error@Base 5.5.35
-#MISSING: 5.5.36# my_progname@Base 5.5.35
- my_progname@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_progname_short@Base 5.5.35
-#MISSING: 5.5.36# my_propagate_complex@Base 5.5.35
-#MISSING: 5.5.36# my_propagate_simple@Base 5.5.35
-#MISSING: 5.5.36# my_pthread_create_detached@Base 5.5.35
-#MISSING: 5.5.36# my_pthread_fastmutex_init@Base 5.5.35
-#MISSING: 5.5.36# my_pthread_fastmutex_lock@Base 5.5.35
-#MISSING: 5.5.36# my_qsort@Base 5.5.35
-#MISSING: 5.5.36# my_read@Base 5.5.35
-#MISSING: 5.5.36# my_readlink@Base 5.5.35
-#MISSING: 5.5.36# my_realloc@Base 5.5.35
- my_realloc@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_realpath@Base 5.5.35
-#MISSING: 5.5.36# my_recv_async@Base 5.5.35
-#MISSING: 5.5.36# my_register_filename@Base 5.5.35
-#MISSING: 5.5.36# my_rnd@Base 5.5.35
-#MISSING: 5.5.36# my_rnd_init@Base 5.5.35
-#MISSING: 5.5.36# my_scan_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_search_option_files@Base 5.5.35
-#MISSING: 5.5.36# my_send_async@Base 5.5.35
-#MISSING: 5.5.36# my_setwd@Base 5.5.35
-#MISSING: 5.5.36# my_snprintf@Base 5.5.35
-#MISSING: 5.5.36# my_snprintf_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_ssl_read_async@Base 5.5.35
-#MISSING: 5.5.36# my_ssl_write_async@Base 5.5.35
-#MISSING: 5.5.36# my_stat@Base 5.5.35
-#MISSING: 5.5.36# my_str_free@Base 5.5.35
-#MISSING: 5.5.36# my_str_malloc@Base 5.5.35
-#MISSING: 5.5.36# my_strcasecmp_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strcasecmp_mb@Base 5.5.35
-#MISSING: 5.5.36# my_strcasecmp_mb_bin@Base 5.5.35
-#MISSING: 5.5.36# my_strdup@Base 5.5.35
- my_strdup@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# my_stream_opened@Base 5.5.35
-#MISSING: 5.5.36# my_string_repertoire@Base 5.5.35
-#MISSING: 5.5.36# my_string_stack_guard@Base 5.5.35
-#MISSING: 5.5.36# my_strndup@Base 5.5.35
-#MISSING: 5.5.36# my_strnncoll_gbk@Base 5.5.35
-#MISSING: 5.5.36# my_strnncoll_gbk_internal@Base 5.5.35
-#MISSING: 5.5.36# my_strnncoll_mb_bin@Base 5.5.35
-#MISSING: 5.5.36# my_strnncoll_simple@Base 5.5.35
-#MISSING: 5.5.36# my_strnncollsp_mb_bin@Base 5.5.35
-#MISSING: 5.5.36# my_strnncollsp_simple@Base 5.5.35
-#MISSING: 5.5.36# my_strntod_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strntol_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strntoll_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strntoul_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strntoull10rnd_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strntoull_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_strnxfrm_simple@Base 5.5.35
-#MISSING: 5.5.36# my_strnxfrm_unicode@Base 5.5.35
-#MISSING: 5.5.36# my_strnxfrm_unicode_full_bin@Base 5.5.35
-#MISSING: 5.5.36# my_strnxfrmlen_simple@Base 5.5.35
-#MISSING: 5.5.36# my_strnxfrmlen_unicode_full_bin@Base 5.5.35
-#MISSING: 5.5.36# my_strtod@Base 5.5.35
-#MISSING: 5.5.36# my_strtoll10@Base 5.5.35
-#MISSING: 5.5.36# my_strtoll10_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_symlink@Base 5.5.35
-#MISSING: 5.5.36# my_sync@Base 5.5.35
-#MISSING: 5.5.36# my_sync_count@Base 5.5.35
-#MISSING: 5.5.36# my_sync_dir@Base 5.5.35
-#MISSING: 5.5.36# my_sync_dir_by_file@Base 5.5.35
-#MISSING: 5.5.36# my_system_gmt_sec@Base 5.5.35
-#MISSING: 5.5.36# my_thread_dbug_id@Base 5.5.35
-#MISSING: 5.5.36# my_thread_destroy_common_mutex@Base 5.5.35
-#MISSING: 5.5.36# my_thread_destroy_internal_mutex@Base 5.5.35
-#MISSING: 5.5.36# my_thread_end@Base 5.5.35
-#MISSING: 5.5.36# my_thread_end_wait_time@Base 5.5.35
-#MISSING: 5.5.36# my_thread_global_end@Base 5.5.35
-#MISSING: 5.5.36# my_thread_global_init@Base 5.5.35
-#MISSING: 5.5.36# my_thread_global_reinit@Base 5.5.35
-#MISSING: 5.5.36# my_thread_init@Base 5.5.35
-#MISSING: 5.5.36# my_thread_name@Base 5.5.35
-#MISSING: 5.5.36# my_thread_stack_size@Base 5.5.35
-#MISSING: 5.5.36# my_thread_var_mutex_in_use@Base 5.5.35
-#MISSING: 5.5.36# my_time_init@Base 5.5.35
-#MISSING: 5.5.36# my_time_to_str@Base 5.5.35
-#MISSING: 5.5.36# my_time_to_wait_for_lock@Base 5.5.35
-#MISSING: 5.5.36# my_tmp_file_created@Base 5.5.35
-#MISSING: 5.5.36# my_umask@Base 5.5.35
-#MISSING: 5.5.36# my_umask_dir@Base 5.5.35
-#MISSING: 5.5.36# my_uncompress@Base 5.5.35
-#MISSING: 5.5.36# my_uni_ctype@Base 5.5.35
-#MISSING: 5.5.36# my_unicase_default@Base 5.5.35
-#MISSING: 5.5.36# my_unicase_mysql500@Base 5.5.35
-#MISSING: 5.5.36# my_unicase_turkish@Base 5.5.35
-#MISSING: 5.5.36# my_use_large_pages@Base 5.5.35
-#MISSING: 5.5.36# my_use_symdir@Base 5.5.35
-#MISSING: 5.5.36# my_vfprintf@Base 5.5.35
-#MISSING: 5.5.36# my_vsnprintf@Base 5.5.35
-#MISSING: 5.5.36# my_vsnprintf_ex@Base 5.5.35
-#MISSING: 5.5.36# my_wc_mb_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_well_formed_len_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_well_formed_len_mb@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_8bit@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_bin@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_mb@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_mb_bin@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_uca@Base 5.5.35
-#MISSING: 5.5.36# my_wildcmp_unicode@Base 5.5.35
-#MISSING: 5.5.36# my_xml_error_lineno@Base 5.5.35
-#MISSING: 5.5.36# my_xml_error_pos@Base 5.5.35
-#MISSING: 5.5.36# my_xml_error_string@Base 5.5.35
-#MISSING: 5.5.36# my_xml_parse@Base 5.5.35
-#MISSING: 5.5.36# my_xml_parser_create@Base 5.5.35
-#MISSING: 5.5.36# my_xml_parser_free@Base 5.5.35
-#MISSING: 5.5.36# my_xml_set_enter_handler@Base 5.5.35
-#MISSING: 5.5.36# my_xml_set_leave_handler@Base 5.5.35
-#MISSING: 5.5.36# my_xml_set_user_data@Base 5.5.35
-#MISSING: 5.5.36# my_xml_set_value_handler@Base 5.5.35
-#MISSING: 5.5.36# myodbc_remove_escape@Base 5.5.35
+ my_progname@libmariadbclient_18 5.5.38
+ my_realloc@libmariadbclient_18 5.5.37
+ my_strdup@libmariadbclient_18 5.5.37
  myodbc_remove_escape@libmariadbclient_16 5.5.36
  myodbc_remove_escape@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_affected_rows@Base 5.5.35
  mysql_affected_rows@libmariadbclient_16 5.5.36
  mysql_affected_rows@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_autocommit@Base 5.5.35
  mysql_autocommit@libmariadbclient_16 5.5.36
  mysql_autocommit@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_autocommit_cont@Base 5.5.35
  mysql_autocommit_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_autocommit_start@Base 5.5.35
  mysql_autocommit_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_change_user@Base 5.5.35
  mysql_change_user@libmariadbclient_16 5.5.36
  mysql_change_user@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_change_user_cont@Base 5.5.35
  mysql_change_user_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_change_user_start@Base 5.5.35
  mysql_change_user_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_character_set_name@Base 5.5.35
  mysql_character_set_name@libmariadbclient_16 5.5.36
  mysql_character_set_name@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_client_builtins@Base 5.5.35
  mysql_client_errors@libmariadbclient_16 5.5.36
  mysql_client_errors@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_client_find_plugin@Base 5.5.35
  mysql_client_find_plugin@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_client_plugin_deinit@Base 5.5.35
-#MISSING: 5.5.36# mysql_client_plugin_init@Base 5.5.35
-#MISSING: 5.5.36# mysql_client_register_plugin@Base 5.5.35
  mysql_client_register_plugin@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_close@Base 5.5.35
  mysql_close@libmariadbclient_16 5.5.36
  mysql_close@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_close_cont@Base 5.5.35
  mysql_close_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_close_slow_part@Base 5.5.35
-#MISSING: 5.5.36# mysql_close_slow_part_cont@Base 5.5.35
-#MISSING: 5.5.36# mysql_close_slow_part_start@Base 5.5.35
-#MISSING: 5.5.36# mysql_close_start@Base 5.5.35
  mysql_close_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_commit@Base 5.5.35
  mysql_commit@libmariadbclient_16 5.5.36
  mysql_commit@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_commit_cont@Base 5.5.35
  mysql_commit_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_commit_start@Base 5.5.35
  mysql_commit_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_data_home@Base 5.5.35
-#MISSING: 5.5.36# mysql_data_seek@Base 5.5.35
  mysql_data_seek@libmariadbclient_16 5.5.36
  mysql_data_seek@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_debug@Base 5.5.35
  mysql_debug@libmariadbclient_16 5.5.36
  mysql_debug@libmariadbclient_18 5.5.36
  mysql_default_charset_info@libmariadbclient_16 5.5.36
  mysql_default_charset_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_detach_stmt_list@Base 5.5.35
-#MISSING: 5.5.36# mysql_dump_debug_info@Base 5.5.35
  mysql_dump_debug_info@libmariadbclient_16 5.5.36
  mysql_dump_debug_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_dump_debug_info_cont@Base 5.5.35
  mysql_dump_debug_info_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_dump_debug_info_start@Base 5.5.35
  mysql_dump_debug_info_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_embedded@Base 5.5.35
  mysql_embedded@libmariadbclient_16 5.5.36
  mysql_embedded@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_eof@Base 5.5.35
  mysql_eof@libmariadbclient_16 5.5.36
  mysql_eof@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_errno@Base 5.5.35
  mysql_errno@libmariadbclient_16 5.5.36
  mysql_errno@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_error@Base 5.5.35
  mysql_error@libmariadbclient_16 5.5.36
  mysql_error@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_escape_string@Base 5.5.35
  mysql_escape_string@libmariadbclient_16 5.5.36
  mysql_escape_string@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_field@Base 5.5.35
  mysql_fetch_field@libmariadbclient_16 5.5.36
  mysql_fetch_field@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_field_direct@Base 5.5.35
  mysql_fetch_field_direct@libmariadbclient_16 5.5.36
  mysql_fetch_field_direct@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_fields@Base 5.5.35
  mysql_fetch_fields@libmariadbclient_16 5.5.36
  mysql_fetch_fields@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_lengths@Base 5.5.35
  mysql_fetch_lengths@libmariadbclient_16 5.5.36
  mysql_fetch_lengths@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_row@Base 5.5.35
  mysql_fetch_row@libmariadbclient_16 5.5.36
  mysql_fetch_row@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_row_cont@Base 5.5.35
  mysql_fetch_row_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_fetch_row_start@Base 5.5.35
  mysql_fetch_row_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_field_count@Base 5.5.35
  mysql_field_count@libmariadbclient_16 5.5.36
  mysql_field_count@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_field_seek@Base 5.5.35
  mysql_field_seek@libmariadbclient_16 5.5.36
  mysql_field_seek@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_field_tell@Base 5.5.35
  mysql_field_tell@libmariadbclient_16 5.5.36
  mysql_field_tell@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_free_result@Base 5.5.35
  mysql_free_result@libmariadbclient_16 5.5.36
  mysql_free_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_free_result_cont@Base 5.5.35
  mysql_free_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_free_result_start@Base 5.5.35
  mysql_free_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_character_set_info@Base 5.5.35
  mysql_get_character_set_info@libmariadbclient_16 5.5.36
  mysql_get_character_set_info@libmariadbclient_18 5.5.36
  mysql_get_charset@libmariadbclient_16 5.5.36
  mysql_get_charset@libmariadbclient_18 5.5.36
  mysql_get_charset_by_csname@libmariadbclient_16 5.5.36
  mysql_get_charset_by_csname@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_client_info@Base 5.5.35
  mysql_get_client_info@libmariadbclient_16 5.5.36
  mysql_get_client_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_client_version@Base 5.5.35
  mysql_get_client_version@libmariadbclient_16 5.5.36
  mysql_get_client_version@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_host_info@Base 5.5.35
  mysql_get_host_info@libmariadbclient_16 5.5.36
  mysql_get_host_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_parameters@Base 5.5.35
  mysql_get_parameters@libmariadbclient_16 5.5.36
  mysql_get_parameters@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_proto_info@Base 5.5.35
  mysql_get_proto_info@libmariadbclient_16 5.5.36
  mysql_get_proto_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_server_info@Base 5.5.35
  mysql_get_server_info@libmariadbclient_16 5.5.36
  mysql_get_server_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_server_name@Base 5.5.35
-#MISSING: 5.5.36# mysql_get_server_version@Base 5.5.35
  mysql_get_server_version@libmariadbclient_16 5.5.36
  mysql_get_server_version@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_socket@Base 5.5.35
  mysql_get_socket@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_ssl_cipher@Base 5.5.35
  mysql_get_ssl_cipher@libmariadbclient_16 5.5.36
  mysql_get_ssl_cipher@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_timeout_value@Base 5.5.35
  mysql_get_timeout_value@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_get_timeout_value_ms@Base 5.5.35
  mysql_get_timeout_value_ms@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_hex_string@Base 5.5.35
  mysql_hex_string@libmariadbclient_16 5.5.36
  mysql_hex_string@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_info@Base 5.5.35
  mysql_info@libmariadbclient_16 5.5.36
  mysql_info@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_init@Base 5.5.35
  mysql_init@libmariadbclient_16 5.5.36
  mysql_init@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_init_character_set@Base 5.5.35
-#MISSING: 5.5.36# mysql_insert_id@Base 5.5.35
  mysql_insert_id@libmariadbclient_16 5.5.36
  mysql_insert_id@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_kill@Base 5.5.35
  mysql_kill@libmariadbclient_16 5.5.36
  mysql_kill@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_kill_cont@Base 5.5.35
  mysql_kill_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_kill_start@Base 5.5.35
  mysql_kill_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_dbs@Base 5.5.35
  mysql_list_dbs@libmariadbclient_16 5.5.36
  mysql_list_dbs@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_dbs_cont@Base 5.5.35
  mysql_list_dbs_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_dbs_start@Base 5.5.35
  mysql_list_dbs_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_fields@Base 5.5.35
  mysql_list_fields@libmariadbclient_16 5.5.36
  mysql_list_fields@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_fields_cont@Base 5.5.35
  mysql_list_fields_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_fields_start@Base 5.5.35
  mysql_list_fields_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_processes@Base 5.5.35
  mysql_list_processes@libmariadbclient_16 5.5.36
  mysql_list_processes@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_processes_cont@Base 5.5.35
  mysql_list_processes_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_processes_start@Base 5.5.35
  mysql_list_processes_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_tables@Base 5.5.35
  mysql_list_tables@libmariadbclient_16 5.5.36
  mysql_list_tables@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_tables_cont@Base 5.5.35
  mysql_list_tables_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_list_tables_start@Base 5.5.35
  mysql_list_tables_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_load_plugin@Base 5.5.35
  mysql_load_plugin@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_load_plugin_v@Base 5.5.35
  mysql_load_plugin_v@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_more_results@Base 5.5.35
  mysql_more_results@libmariadbclient_16 5.5.36
  mysql_more_results@libmariadbclient_18 5.5.36
  mysql_net_realloc@libmariadbclient_16 5.5.36
  mysql_net_realloc@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_next_result@Base 5.5.35
  mysql_next_result@libmariadbclient_16 5.5.36
  mysql_next_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_next_result_cont@Base 5.5.35
  mysql_next_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_next_result_start@Base 5.5.35
  mysql_next_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_num_fields@Base 5.5.35
  mysql_num_fields@libmariadbclient_16 5.5.36
  mysql_num_fields@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_num_rows@Base 5.5.35
  mysql_num_rows@libmariadbclient_16 5.5.36
  mysql_num_rows@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_options@Base 5.5.35
  mysql_options@libmariadbclient_16 5.5.36
  mysql_options@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_ping@Base 5.5.35
  mysql_ping@libmariadbclient_16 5.5.36
  mysql_ping@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_ping_cont@Base 5.5.35
  mysql_ping_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_ping_start@Base 5.5.35
  mysql_ping_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_plugin_options@Base 5.5.35
  mysql_plugin_options@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_port@Base 5.5.35
-#MISSING: 5.5.36# mysql_query@Base 5.5.35
  mysql_query@libmariadbclient_16 5.5.36
  mysql_query@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_query_cont@Base 5.5.35
  mysql_query_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_query_start@Base 5.5.35
  mysql_query_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_read_default_options@Base 5.5.35
-#MISSING: 5.5.36# mysql_read_query_result@Base 5.5.35
  mysql_read_query_result@libmariadbclient_16 5.5.36
  mysql_read_query_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_read_query_result_cont@Base 5.5.35
  mysql_read_query_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_read_query_result_start@Base 5.5.35
  mysql_read_query_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_connect@Base 5.5.35
  mysql_real_connect@libmariadbclient_16 5.5.36
  mysql_real_connect@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_connect_cont@Base 5.5.35
  mysql_real_connect_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_connect_start@Base 5.5.35
  mysql_real_connect_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_escape_string@Base 5.5.35
  mysql_real_escape_string@libmariadbclient_16 5.5.36
  mysql_real_escape_string@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_query@Base 5.5.35
  mysql_real_query@libmariadbclient_16 5.5.36
  mysql_real_query@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_query_cont@Base 5.5.35
  mysql_real_query_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_real_query_start@Base 5.5.35
  mysql_real_query_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_reconnect@Base 5.5.35
-#MISSING: 5.5.36# mysql_refresh@Base 5.5.35
  mysql_refresh@libmariadbclient_16 5.5.36
  mysql_refresh@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_refresh_cont@Base 5.5.35
  mysql_refresh_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_refresh_start@Base 5.5.35
  mysql_refresh_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_rollback@Base 5.5.35
  mysql_rollback@libmariadbclient_16 5.5.36
  mysql_rollback@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_rollback_cont@Base 5.5.35
  mysql_rollback_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_rollback_start@Base 5.5.35
  mysql_rollback_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_row_seek@Base 5.5.35
  mysql_row_seek@libmariadbclient_16 5.5.36
  mysql_row_seek@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_row_tell@Base 5.5.35
  mysql_row_tell@libmariadbclient_16 5.5.36
  mysql_row_tell@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_select_db@Base 5.5.35
  mysql_select_db@libmariadbclient_16 5.5.36
  mysql_select_db@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_select_db_cont@Base 5.5.35
  mysql_select_db_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_select_db_start@Base 5.5.35
  mysql_select_db_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_send_query@Base 5.5.35
  mysql_send_query@libmariadbclient_16 5.5.36
  mysql_send_query@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_send_query_cont@Base 5.5.35
  mysql_send_query_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_send_query_start@Base 5.5.35
  mysql_send_query_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_server_end@Base 5.5.35
  mysql_server_end@libmariadbclient_16 5.5.36
  mysql_server_end@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_server_init@Base 5.5.35
  mysql_server_init@libmariadbclient_16 5.5.36
  mysql_server_init@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_server_last_errno@Base 5.5.35
-#MISSING: 5.5.36# mysql_server_last_error@Base 5.5.35
-#MISSING: 5.5.36# mysql_set_character_set@Base 5.5.35
  mysql_set_character_set@libmariadbclient_16 5.5.36
  mysql_set_character_set@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_character_set_cont@Base 5.5.35
  mysql_set_character_set_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_character_set_start@Base 5.5.35
  mysql_set_character_set_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_local_infile_default@Base 5.5.35
  mysql_set_local_infile_default@libmariadbclient_16 5.5.36
  mysql_set_local_infile_default@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_local_infile_handler@Base 5.5.35
  mysql_set_local_infile_handler@libmariadbclient_16 5.5.36
  mysql_set_local_infile_handler@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_server_option@Base 5.5.35
  mysql_set_server_option@libmariadbclient_16 5.5.36
  mysql_set_server_option@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_server_option_cont@Base 5.5.35
  mysql_set_server_option_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_set_server_option_start@Base 5.5.35
  mysql_set_server_option_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_sha1_input@Base 5.5.35
-#MISSING: 5.5.36# mysql_sha1_reset@Base 5.5.35
-#MISSING: 5.5.36# mysql_sha1_result@Base 5.5.35
-#MISSING: 5.5.36# mysql_shutdown@Base 5.5.35
  mysql_shutdown@libmariadbclient_16 5.5.36
  mysql_shutdown@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_shutdown_cont@Base 5.5.35
  mysql_shutdown_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_shutdown_start@Base 5.5.35
  mysql_shutdown_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_socket_shutdown@Base 5.5.35
-#MISSING: 5.5.36# mysql_sqlstate@Base 5.5.35
  mysql_sqlstate@libmariadbclient_16 5.5.36
  mysql_sqlstate@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_ssl_set@Base 5.5.35
  mysql_ssl_set@libmariadbclient_16 5.5.36
  mysql_ssl_set@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stat@Base 5.5.35
  mysql_stat@libmariadbclient_16 5.5.36
  mysql_stat@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stat_cont@Base 5.5.35
  mysql_stat_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stat_start@Base 5.5.35
  mysql_stat_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stdin@Base 5.5.35
-#MISSING: 5.5.36# mysql_stmt_affected_rows@Base 5.5.35
  mysql_stmt_affected_rows@libmariadbclient_16 5.5.36
  mysql_stmt_affected_rows@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_attr_get@Base 5.5.35
  mysql_stmt_attr_get@libmariadbclient_16 5.5.36
  mysql_stmt_attr_get@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_attr_set@Base 5.5.35
  mysql_stmt_attr_set@libmariadbclient_16 5.5.36
  mysql_stmt_attr_set@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_bind_param@Base 5.5.35
  mysql_stmt_bind_param@libmariadbclient_16 5.5.36
  mysql_stmt_bind_param@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_bind_result@Base 5.5.35
  mysql_stmt_bind_result@libmariadbclient_16 5.5.36
  mysql_stmt_bind_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_close@Base 5.5.35
  mysql_stmt_close@libmariadbclient_16 5.5.36
  mysql_stmt_close@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_close_cont@Base 5.5.35
  mysql_stmt_close_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_close_start@Base 5.5.35
  mysql_stmt_close_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_data_seek@Base 5.5.35
  mysql_stmt_data_seek@libmariadbclient_16 5.5.36
  mysql_stmt_data_seek@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_errno@Base 5.5.35
  mysql_stmt_errno@libmariadbclient_16 5.5.36
  mysql_stmt_errno@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_error@Base 5.5.35
  mysql_stmt_error@libmariadbclient_16 5.5.36
  mysql_stmt_error@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_execute@Base 5.5.35
  mysql_stmt_execute@libmariadbclient_16 5.5.36
  mysql_stmt_execute@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_execute_cont@Base 5.5.35
  mysql_stmt_execute_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_execute_start@Base 5.5.35
  mysql_stmt_execute_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_fetch@Base 5.5.35
  mysql_stmt_fetch@libmariadbclient_16 5.5.36
  mysql_stmt_fetch@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_fetch_column@Base 5.5.35
  mysql_stmt_fetch_column@libmariadbclient_16 5.5.36
  mysql_stmt_fetch_column@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_fetch_cont@Base 5.5.35
  mysql_stmt_fetch_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_fetch_start@Base 5.5.35
  mysql_stmt_fetch_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_field_count@Base 5.5.35
  mysql_stmt_field_count@libmariadbclient_16 5.5.36
  mysql_stmt_field_count@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_free_result@Base 5.5.35
  mysql_stmt_free_result@libmariadbclient_16 5.5.36
  mysql_stmt_free_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_free_result_cont@Base 5.5.35
  mysql_stmt_free_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_free_result_start@Base 5.5.35
  mysql_stmt_free_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_init@Base 5.5.35
  mysql_stmt_init@libmariadbclient_16 5.5.36
  mysql_stmt_init@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_insert_id@Base 5.5.35
  mysql_stmt_insert_id@libmariadbclient_16 5.5.36
  mysql_stmt_insert_id@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_next_result@Base 5.5.35
  mysql_stmt_next_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_next_result_cont@Base 5.5.35
  mysql_stmt_next_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_next_result_start@Base 5.5.35
  mysql_stmt_next_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_num_rows@Base 5.5.35
  mysql_stmt_num_rows@libmariadbclient_16 5.5.36
  mysql_stmt_num_rows@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_param_count@Base 5.5.35
  mysql_stmt_param_count@libmariadbclient_16 5.5.36
  mysql_stmt_param_count@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_param_metadata@Base 5.5.35
  mysql_stmt_param_metadata@libmariadbclient_16 5.5.36
  mysql_stmt_param_metadata@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_prepare@Base 5.5.35
  mysql_stmt_prepare@libmariadbclient_16 5.5.36
  mysql_stmt_prepare@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_prepare_cont@Base 5.5.35
  mysql_stmt_prepare_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_prepare_start@Base 5.5.35
  mysql_stmt_prepare_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_reset@Base 5.5.35
  mysql_stmt_reset@libmariadbclient_16 5.5.36
  mysql_stmt_reset@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_reset_cont@Base 5.5.35
  mysql_stmt_reset_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_reset_start@Base 5.5.35
  mysql_stmt_reset_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_result_metadata@Base 5.5.35
  mysql_stmt_result_metadata@libmariadbclient_16 5.5.36
  mysql_stmt_result_metadata@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_row_seek@Base 5.5.35
  mysql_stmt_row_seek@libmariadbclient_16 5.5.36
  mysql_stmt_row_seek@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_row_tell@Base 5.5.35
  mysql_stmt_row_tell@libmariadbclient_16 5.5.36
  mysql_stmt_row_tell@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_send_long_data@Base 5.5.35
  mysql_stmt_send_long_data@libmariadbclient_16 5.5.36
  mysql_stmt_send_long_data@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_send_long_data_cont@Base 5.5.35
  mysql_stmt_send_long_data_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_send_long_data_start@Base 5.5.35
  mysql_stmt_send_long_data_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_sqlstate@Base 5.5.35
  mysql_stmt_sqlstate@libmariadbclient_16 5.5.36
  mysql_stmt_sqlstate@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_store_result@Base 5.5.35
  mysql_stmt_store_result@libmariadbclient_16 5.5.36
  mysql_stmt_store_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_store_result_cont@Base 5.5.35
  mysql_stmt_store_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_stmt_store_result_start@Base 5.5.35
  mysql_stmt_store_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_store_result@Base 5.5.35
  mysql_store_result@libmariadbclient_16 5.5.36
  mysql_store_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_store_result_cont@Base 5.5.35
  mysql_store_result_cont@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_store_result_start@Base 5.5.35
  mysql_store_result_start@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_thread_end@Base 5.5.35
  mysql_thread_end@libmariadbclient_16 5.5.36
  mysql_thread_end@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_thread_id@Base 5.5.35
  mysql_thread_id@libmariadbclient_16 5.5.36
  mysql_thread_id@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_thread_init@Base 5.5.35
  mysql_thread_init@libmariadbclient_16 5.5.36
  mysql_thread_init@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_thread_safe@Base 5.5.35
  mysql_thread_safe@libmariadbclient_16 5.5.36
  mysql_thread_safe@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_unix_port@Base 5.5.35
-#MISSING: 5.5.36# mysql_use_result@Base 5.5.35
  mysql_use_result@libmariadbclient_16 5.5.36
  mysql_use_result@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysql_warning_count@Base 5.5.35
  mysql_warning_count@libmariadbclient_16 5.5.36
  mysql_warning_count@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# mysys_usage_id@Base 5.5.35
-#MISSING: 5.5.36# net_buffer_length@Base 5.5.35
-#MISSING: 5.5.36# net_clear@Base 5.5.35
-#MISSING: 5.5.36# net_clear_error@Base 5.5.35
-#MISSING: 5.5.36# net_end@Base 5.5.35
-#MISSING: 5.5.36# net_field_length@Base 5.5.35
-#MISSING: 5.5.36# net_field_length_ll@Base 5.5.35
-#MISSING: 5.5.36# net_flush@Base 5.5.35
-#MISSING: 5.5.36# net_real_write@Base 5.5.35
-#MISSING: 5.5.36# net_realloc@Base 5.5.35
  net_realloc@libmariadbclient_16 5.5.36
  net_realloc@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# net_store_length@Base 5.5.35
-#MISSING: 5.5.36# net_write_command@Base 5.5.35
-#MISSING: 5.5.36# new_VioSSLAcceptorFd@Base 5.5.35
-#MISSING: 5.5.36# new_VioSSLConnectorFd@Base 5.5.35
-#MISSING: 5.5.36# normalize_dirname@Base 5.5.35
-#MISSING: 5.5.36# not_error_sqlstate@Base 5.5.35
-#MISSING: 5.5.36# number_to_datetime@Base 5.5.35
-#MISSING: 5.5.36# number_to_time@Base 5.5.35
-#MISSING: 5.5.36# octet2hex@Base 5.5.35
-#MISSING: 5.5.36# opt_flush_ok_packet@Base 5.5.35
-#MISSING: 5.5.36# pack_dirname@Base 5.5.35
-#MISSING: 5.5.36# pack_time@Base 5.5.35
-#MISSING: 5.5.36# packfrm@Base 5.5.35
-#MISSING: 5.5.36# plugin_list@Base 5.5.35
-#MISSING: 5.5.36# pop_dynamic@Base 5.5.35
-#MISSING: 5.5.36# print_defaults@Base 5.5.35
-#MISSING: 5.5.36# proc_info_hook@Base 5.5.35
-#MISSING: 5.5.36# pthread_dummy@Base 5.5.35
-#MISSING: 5.5.36# read_user_name@Base 5.5.35
-#MISSING: 5.5.36# reset_root_defaults@Base 5.5.35
-#MISSING: 5.5.36# resolve_charset@Base 5.5.35
-#MISSING: 5.5.36# resolve_collation@Base 5.5.35
-#MISSING: 5.5.36# run_plugin_auth@Base 5.5.35
-#MISSING: 5.5.36# scramble@Base 5.5.35
  scramble@libmariadbclient_16 5.5.36
  scramble@libmariadbclient_18 5.5.36
-#MISSING: 5.5.36# scramble_323@Base 5.5.35
-#MISSING: 5.5.36# set_dynamic@Base 5.5.35
- set_dynamic@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# set_mysql_error@Base 5.5.35
-#MISSING: 5.5.36# set_mysql_extended_error@Base 5.5.35
-#MISSING: 5.5.36# set_prealloc_root@Base 5.5.35
-#MISSING: 5.5.36# set_stmt_errmsg@Base 5.5.35
-#MISSING: 5.5.36# set_stmt_error@Base 5.5.35
-#MISSING: 5.5.36# set_zero_time@Base 5.5.35
-#MISSING: 5.5.36# sf_leaking_memory@Base 5.5.35
-#MISSING: 5.5.36# sha_const_key@Base 5.5.35
-#MISSING: 5.5.36# soundex_map@Base 5.5.35
-#MISSING: 5.5.36# sql_protocol_names_lib@Base 5.5.35
-#MISSING: 5.5.36# sql_protocol_typelib@Base 5.5.35
-#MISSING: 5.5.36# sslGetErrString@Base 5.5.35
-#MISSING: 5.5.36# sslaccept@Base 5.5.35
-#MISSING: 5.5.36# sslconnect@Base 5.5.35
-#MISSING: 5.5.36# str2int@Base 5.5.35
-#MISSING: 5.5.36# str_to_datetime@Base 5.5.35
-#MISSING: 5.5.36# str_to_time@Base 5.5.35
-#MISSING: 5.5.36# strcend@Base 5.5.35
-#MISSING: 5.5.36# strdup_root@Base 5.5.35
- strdup_root@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strend@Base 5.5.35
- strend@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strfill@Base 5.5.35
- strfill@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strlength@Base 5.5.35
-#MISSING: 5.5.36# strmake@Base 5.5.35
- strmake@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strmake_root@Base 5.5.35
- strmake_root@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strmov_overlapp@Base 5.5.35
-#MISSING: 5.5.36# strnmov@Base 5.5.35
-#MISSING: 5.5.36# strxmov@Base 5.5.35
- strxmov@libmariadbclient_18 5.5.40
-#MISSING: 5.5.36# strxnmov@Base 5.5.35
-#MISSING: 5.5.36# system_filename@Base 5.5.35
-#MISSING: 5.5.36# test_if_hard_path@Base 5.5.35
-#MISSING: 5.5.36# thd_lib_detected@Base 5.5.35
-#MISSING: 5.5.36# thr_set_sync_wait_callback@Base 5.5.35
-#MISSING: 5.5.36# timed_mutexes@Base 5.5.35
-#MISSING: 5.5.36# ullstr@Base 5.5.35
-#MISSING: 5.5.36# ulonglong2decimal@Base 5.5.35
-#MISSING: 5.5.36# unknown_sqlstate@Base 5.5.35
-#MISSING: 5.5.36# unpack_dirname@Base 5.5.35
-#MISSING: 5.5.36# unpack_fields@Base 5.5.35
-#MISSING: 5.5.36# unpack_filename@Base 5.5.35
-#MISSING: 5.5.36# unpack_time@Base 5.5.35
-#MISSING: 5.5.36# unpackfrm@Base 5.5.35
-#MISSING: 5.5.36# vio_blocking@Base 5.5.35
-#MISSING: 5.5.36# vio_buff_has_data@Base 5.5.35
-#MISSING: 5.5.36# vio_close@Base 5.5.35
-#MISSING: 5.5.36# vio_delete@Base 5.5.35
-#MISSING: 5.5.36# vio_description@Base 5.5.35
-#MISSING: 5.5.36# vio_end@Base 5.5.35
-#MISSING: 5.5.36# vio_errno@Base 5.5.35
-#MISSING: 5.5.36# vio_fastsend@Base 5.5.35
-#MISSING: 5.5.36# vio_fd@Base 5.5.35
-#MISSING: 5.5.36# vio_get_normalized_ip_string@Base 5.5.35
-#MISSING: 5.5.36# vio_getnameinfo@Base 5.5.35
-#MISSING: 5.5.36# vio_is_blocking@Base 5.5.35
-#MISSING: 5.5.36# vio_is_connected@Base 5.5.35
-#MISSING: 5.5.36# vio_is_no_name_error@Base 5.5.35
-#MISSING: 5.5.36# vio_keepalive@Base 5.5.35
-#MISSING: 5.5.36# vio_new@Base 5.5.35
-#MISSING: 5.5.36# vio_peer_addr@Base 5.5.35
-#MISSING: 5.5.36# vio_pending@Base 5.5.35
-#MISSING: 5.5.36# vio_poll_read@Base 5.5.35
-#MISSING: 5.5.36# vio_read@Base 5.5.35
-#MISSING: 5.5.36# vio_read_buff@Base 5.5.35
-#MISSING: 5.5.36# vio_reset@Base 5.5.35
-#MISSING: 5.5.36# vio_should_retry@Base 5.5.35
-#MISSING: 5.5.36# vio_socket_shutdown@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_blocking@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_close@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_delete@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_has_data@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_read@Base 5.5.35
-#MISSING: 5.5.36# vio_ssl_write@Base 5.5.35
-#MISSING: 5.5.36# vio_timeout@Base 5.5.35
-#MISSING: 5.5.36# vio_type@Base 5.5.35
-#MISSING: 5.5.36# vio_was_interrupted@Base 5.5.35
-#MISSING: 5.5.36# vio_write@Base 5.5.35
-#MISSING: 5.5.36# wait_for_free_space@Base 5.5.35
-#MISSING: 5.5.36# year_2000_handling@Base 5.5.35
+ set_dynamic@libmariadbclient_18 5.5.37
+ strdup_root@libmariadbclient_18 5.5.37
+ strend@libmariadbclient_18 5.5.37
+ strfill@libmariadbclient_18 5.5.37
+ strmake@libmariadbclient_18 5.5.37
+ strmake_root@libmariadbclient_18 5.5.37
+ strxmov@libmariadbclient_18 5.5.37
 mysql_clear_password.so libmariadbclient18 #MINVER#
  _mysql_client_plugin_declaration_@Base 5.5.35
diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index e2c9d5c1d28052721adb1d89d03ab0eaed3b5224..b2b7a2ba69d01cb4fa8961b39f550ce6b357a72c 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,6 +1,9 @@
 # These are OK for -dev package
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-libmariadbd-dev: no-shlibs-control-file usr/lib/x86_64-linux-gnu/libmysqld.so.18
+# OK, embedded has same source
 libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
-# OK, newer Debian should support xz
-libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
+libmariadbd-dev: embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient
+# OK, this is in fact a dev package
+# but for soname libmysqlclient
+# (due to upstream reasons)
+libmariadbd-dev: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/libmysqld.so.18 usr/lib/x86_64-linux-gnu/libmysqld.so
diff --git a/debian/mariadb-client-5.5.links b/debian/mariadb-client-5.5.links
index 247369fa218d757405ebd48b17ed86e75df652c2..0b86e87f2e92b2c0391f4ad9062364b33cf1b15d 100644
--- a/debian/mariadb-client-5.5.links
+++ b/debian/mariadb-client-5.5.links
@@ -1,3 +1,6 @@
 usr/bin/mysqlcheck usr/bin/mysqlrepair
 usr/bin/mysqlcheck usr/bin/mysqlanalyze
 usr/bin/mysqlcheck usr/bin/mysqloptimize
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz
+usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz
diff --git a/debian/mariadb-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
index a33259f73af4c2e6ea6d4c17eb80442e8cf08fdd..e45ad274f7d2c55a8456c11228066ab77033eb50 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -1,15 +1,6 @@
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqladmin.1.gz 28: warning [p 1, 1.5i]: can't break line
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqldump.1.gz 2047: warning [p 12, 1.3i, div `3tbd2,1', 0.2i]: can't break line
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man8/mysqlmanager.8.gz 1509: warning [p 11, 4.8i, div `3tbd7,1', 5.2i]: can't break line
-mariadb-client-5.5: binary-without-manpage usr/bin/innochecksum
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqlanalyze
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqloptimize
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqlrepair
-# embedded libs are OK
+# OK, embedded has same source
 mariadb-client-5.5: embedded-library usr/bin/mysqladmin: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqldump: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqlimport: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqlshow: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqlslap: libmysqlclient
-# OK, newer Debian should support xz
-mariadb-client-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-client-5.5.manpages b/debian/mariadb-client-5.5.manpages
index f191979b2038d86e077bc98d4b28d043c843e439..93b19bfbe425833a5402a1a451b97c85a66f0cde 100644
--- a/debian/mariadb-client-5.5.manpages
+++ b/debian/mariadb-client-5.5.manpages
@@ -10,5 +10,5 @@ debian/tmp/usr/share/man/man1/mysqlimport.1
 debian/additions/mysqlreport.1
 debian/tmp/usr/share/man/man1/mysqlshow.1
 debian/tmp/usr/share/man/man1/mysqlslap.1
-debian/additions/mysql_tableinfo.1
 debian/tmp/usr/share/man/man1/mysql_waitpid.1
+debian/tmp/usr/share/man/man1/innochecksum.1
\ No newline at end of file
diff --git a/debian/mariadb-client-5.5.menu b/debian/mariadb-client-5.5.menu
index c7f96fcb0badfeaff4df93cba7adb9e9d10e14e6..5deb5814f507ee5f241eec5f733a0df985a744e0 100644
--- a/debian/mariadb-client-5.5.menu
+++ b/debian/mariadb-client-5.5.menu
@@ -1,3 +1,3 @@
 # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
 ?package(mariadb-client-5.5):needs="text" section="Applications/Data Management"\
-  title="innotop" command="/usr/bin/innotop"
+  title="Innotop" command="/usr/bin/innotop"
diff --git a/debian/mariadb-client-core-5.5.lintian-overrides b/debian/mariadb-client-core-5.5.lintian-overrides
index 2f8573af7860aab647591c817bfa636f52bbc8f9..90d7ccb8a774e2aa0be02ada4644e27683787943 100644
--- a/debian/mariadb-client-core-5.5.lintian-overrides
+++ b/debian/mariadb-client-core-5.5.lintian-overrides
@@ -1,5 +1,3 @@
-# these libs are OK
+# these libs are OK# OK, embedded has same source
 mariadb-client-core-5.5: embedded-library usr/bin/mysql: libmysqlclient
 mariadb-client-core-5.5: embedded-library usr/bin/mysqlcheck: libmysqlclient
-# OK in neẃer Debian, includes support for xz
-mariadb-client-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-client.lintian-overrides b/debian/mariadb-client.lintian-overrides
deleted file mode 100644
index 03c5a5e9a31db7140bd0ce1bc83e073d021c6534..0000000000000000000000000000000000000000
--- a/debian/mariadb-client.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# OK in neẃer Debian, includes support for xz
-mariadb-client: data.tar.xz-member-without-dpkg-pre-depends
-
diff --git a/debian/mariadb-common.lintian-overrides b/debian/mariadb-common.lintian-overrides
deleted file mode 100644
index 5ee222be548084ba52bdf1e0ba28001eb823fb42..0000000000000000000000000000000000000000
--- a/debian/mariadb-common.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-mariadb-common: data.tar.xz-member-without-dpkg-pre-depends
-# OK in neẃer Debian, includes support for xz
-mariadb-common: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server-5.5.config b/debian/mariadb-server-5.5.config
index 424982acc3c6b5d5b7b15b3e029fa7f40f666170..a4c65f3ea78764604885d6fae7dce6fc0c9cfe99 100644
--- a/debian/mariadb-server-5.5.config
+++ b/debian/mariadb-server-5.5.config
@@ -11,7 +11,7 @@ CNF=/etc/mysql/my.cnf
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.1/nis_warning || true
+  db_input high mysql-server-5.5/nis_warning || true
   db_go
 fi
 
diff --git a/debian/mariadb-server-5.5.dirs b/debian/mariadb-server-5.5.dirs
index a234d5f3b4902dab04ef29a75e2c99b8a9fcb73f..e23e5b0b92121344a1cfaea67e314ec46b2d4bfa 100644
--- a/debian/mariadb-server-5.5.dirs
+++ b/debian/mariadb-server-5.5.dirs
@@ -2,8 +2,6 @@ etc/init.d
 etc/logrotate.d
 etc/mysql/conf.d
 usr/bin
-usr/sbin
-usr/share/man/man8
 usr/share/mysql
 usr/share/doc/mariadb-server-5.5
 var/lib/mysql-upgrade
diff --git a/debian/mariadb-server-5.5.install b/debian/mariadb-server-5.5.install
index 553931365235e07684fdcc1d50df4d5b5995cbe4..82e43100a6135f7281f84620cfd2f14320d490fa 100644
--- a/debian/mariadb-server-5.5.install
+++ b/debian/mariadb-server-5.5.install
@@ -33,33 +33,12 @@ usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/server_audit.so
 usr/lib/mysql/plugin/sphinx.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/share/doc/mariadb-server-5.5/INFO_BIN
 usr/share/doc/mariadb-server-5.5/INFO_SRC
 usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
-usr/share/man/man1/innochecksum.1
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/myisam_ftdump.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-usr/share/man/man1/resolve_stack_dump.1
-usr/share/man/man1/resolveip.1
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 3a724d086f1b842966d74255718fb003d33ca8b8..363c175f35fa979e503e18bb9ce00d961a7028c7 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -1,16 +1,6 @@
+# Embedded from same source is OK
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/auth_pam.so
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/dialog.so
-mariadb-server-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqlbinlog.1.gz 1313: warning [p 9, 1.8i, div `3tbd3,2', 0.8i]: can't break line
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_chk
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_dump_log
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_ftdump
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_pack
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_read_log
-mariadb-server-5.5: binary-without-manpage usr/bin/mysql_plugin
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:146 /bin/bash
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:194 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:208 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:216 /bin/echo
-# OK in neẃer Debian, includes support for xz
-mariadb-server-5.5: data.tar.xz-member-without-dpkg-pre-depends
+# ash's buildin has no "-e" so use /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:195 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:209 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:217 /bin/echo
diff --git a/debian/mariadb-server-5.5.manpages b/debian/mariadb-server-5.5.manpages
index ce7300bb799cedaf1a307883efb10861e7fdc8a8..ae9ebac9f0768d6f97c31e5654c54df3d79a7ca0 100644
--- a/debian/mariadb-server-5.5.manpages
+++ b/debian/mariadb-server-5.5.manpages
@@ -1,3 +1,8 @@
+debian/tmp/usr/share/man/man1/aria_chk.1
+debian/tmp/usr/share/man/man1/aria_dump_log.1
+debian/tmp/usr/share/man/man1/aria_ftdump.1
+debian/tmp/usr/share/man/man1/aria_pack.1
+debian/tmp/usr/share/man/man1/aria_read_log.1
 debian/tmp/usr/share/man/man1/msql2mysql.1
 debian/tmp/usr/share/man/man1/myisamchk.1
 debian/tmp/usr/share/man/man1/myisam_ftdump.1
@@ -10,13 +15,13 @@ debian/tmp/usr/share/man/man1/mysqld_multi.1
 debian/tmp/usr/share/man/man1/mysqld_safe.1
 debian/tmp/usr/share/man/man1/mysqlhotcopy.1
 debian/tmp/usr/share/man/man1/mysql_install_db.1
+debian/tmp/usr/share/man/man1/mysql_plugin.1
 debian/tmp/usr/share/man/man1/mysql_secure_installation.1
 debian/tmp/usr/share/man/man1/mysql_setpermission.1
+debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
 debian/tmp/usr/share/man/man1/mysql_upgrade.1
 debian/tmp/usr/share/man/man1/mysql_zap.1
 debian/tmp/usr/share/man/man1/perror.1
 debian/tmp/usr/share/man/man1/replace.1
 debian/tmp/usr/share/man/man1/resolveip.1
 debian/tmp/usr/share/man/man1/resolve_stack_dump.1
-debian/tmp/usr/share/man/man1/innochecksum.1
-debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
diff --git a/debian/mariadb-server-5.5.postinst b/debian/mariadb-server-5.5.postinst
index cb05f6ebe94b0e0d589ce632eb6ce7bca0a82b88..b73c35cab1c4267ed046feb1c59126404c71a9ee 100644
--- a/debian/mariadb-server-5.5.postinst
+++ b/debian/mariadb-server-5.5.postinst
@@ -98,7 +98,7 @@ removed your symlink (see #182747 and others).  the mysql packages noticed
 that this happened, and as a workaround have restored it.  however, because
 /var/lib/mysql seems to have been re-created in the meantime, and because
 we don't want to rm -rf something we don't know as much about, we are going
-to leave this unexpected directory here.  If your database looks normal,
+to leave this unexpected directory here. If your database looks normal,
 and this is not a symlink to your database, you should be able to blow
 this all away.
 
@@ -120,6 +120,7 @@ EOF
     set +e
     chown -R 0:0 $mysql_datadir
     chown -R mysql $mysql_statedir
+    chown -R mysql $mysql_rundir
     chown -R mysql:adm $mysql_newlogdir;	chmod 2750 $mysql_newlogdir;
     for i in log err; do
       touch             $mysql_logdir/mysql.$i
@@ -140,10 +141,10 @@ EOF
     # This will fail if we are upgrading an existing database; in this case
     # mysql_upgrade, called from the /etc/init.d/mysql start script, will
     # handle things.
-    # Debian: beware of the bashisms... 
-    # Debian: can safely run on upgrades with existing databases 
+    # Debian: beware of the bashisms...
+    # Debian: can safely run on upgrades with existing databases
     set +e
-    /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
     set -e
     
     ## On every reconfiguration the maintenance user is recreated.
@@ -164,7 +165,7 @@ EOF
     #   the old query which always succeeds and then the new which may or may not.
 
     # recreate the credentials file if not present or without mysql_upgrade stanza
-    dc=$mysql_cfgdir/debian.cnf; 
+    dc=$mysql_cfgdir/debian.cnf;
     if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
         pass="`sed -n 's/^[     ]*password *= *// p' $dc | head -n 1`"
     else
@@ -190,10 +191,10 @@ EOF
 
     # update privilege tables
     password_column_fix_query=`/bin/echo -e \
-        "USE mysql\n" \
-        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
+        "USE mysql;\n" \
+        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"`
     replace_query=`/bin/echo -e \
-        "USE mysql\n" \
+        "USE mysql;\n" \
         "SET sql_mode='';\n" \
         "REPLACE INTO user SET " \
         "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
diff --git a/debian/mariadb-server-5.5.postrm b/debian/mariadb-server-5.5.postrm
index 1f798905487eb97e772dff149406e60d72d12385..e01eb17078eacf6432e6f4df5f9e63473a9ca3e0 100644
--- a/debian/mariadb-server-5.5.postrm
+++ b/debian/mariadb-server-5.5.postrm
@@ -46,15 +46,15 @@ esac
 #
 # - Do NOT purge logs or data if another mysql-sever* package is installed (#307473)
 # - Remove the mysql user only after all his owned files are purged.
-#   
+#
 if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then
   # we remove the mysql user only after all his owned files are purged
   rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
   rm -rf /var/log/mysql
 
-  db_input high mysql-server-5.1/postrm_remove_databases || true
+  db_input high mysql-server-5.5/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.1/postrm_remove_databases || true
+  db_get mysql-server-5.5/postrm_remove_databases || true
   if [ "$RET" = "true" ]; then
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!
diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst
index 209d0c0fc567771ed6fe1dd12da78579e2f0e481..f206b58cc59ddfa683518ed73b716fca9194653f 100644
--- a/debian/mariadb-server-5.5.preinst
+++ b/debian/mariadb-server-5.5.preinst
@@ -46,8 +46,6 @@ stop_server() {
 
 ################################ main() ##########################
 
-this_version=5.5
-
 # Show warning if old data exists
 if [ -d $DATADIR ]; then
   db_input high mariadb-server/oneway_migration || true
@@ -78,22 +76,22 @@ fi
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
   found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
-  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
+  if dpkg --compare-versions "5.5" '<<' "$found_version"; then
     show_downgrade_warning=1
     break;
   fi
 done
 if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mariadb-server-$this_version/really_downgrade seen false || true
-  db_input medium mariadb-server-$this_version/really_downgrade || true
+  db_fset mariadb-server-5.5/really_downgrade seen false || true
+  db_input medium mariadb-server-5.5/really_downgrade || true
   db_go
-  db_get mariadb-server-$this_version/really_downgrade || true
+  db_get mariadb-server-5.5/really_downgrade || true
   if [ "$RET" = "true" ]; then
     rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-$this_version.flag
+    touch $DATADIR/debian-5.5.flag
   else
-    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
-    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
+    echo "Aborting downgrade from (at least) $found_version to 5.5." 1>&2
+    echo "If are sure you want to downgrade to 5.5, remove the file" 1>&2
     echo "$DATADIR/debian-*.flag and try installing again." 1>&2
     db_stop
     exit 1
diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.py b/debian/mariadb-server-5.5.py
similarity index 100%
rename from debian/dist/Ubuntu/mariadb-server-5.5.py
rename to debian/mariadb-server-5.5.py
diff --git a/debian/mariadb-server-core-5.5.lintian-overrides b/debian/mariadb-server-core-5.5.lintian-overrides
index bc0f142faec799f5f5d88a10cdd737ebe98c6d79..513688b566f01a8afff104ab9bb29697fc20fcee 100644
--- a/debian/mariadb-server-core-5.5.lintian-overrides
+++ b/debian/mariadb-server-core-5.5.lintian-overrides
@@ -1,3 +1,2 @@
+# Embedded with same source OK
 mariadb-server-core-5.5: embedded-library usr/sbin/mysqld: libmysqlclient
-# OK in neẃer Debian, includes support for xz
-mariadb-server-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server.lintian-overrides b/debian/mariadb-server.lintian-overrides
deleted file mode 100644
index 67b32a90fd4c1485579c590125c6e9c95b5c54a8..0000000000000000000000000000000000000000
--- a/debian/mariadb-server.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# OK in neẃer Debian, includes support for xz
-mariadb-server: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-test-5.5.dirs b/debian/mariadb-test-5.5.dirs
index ef62d2bc34ecf20e0ec03c06cc081e2c28c5d632..699aa510c0c5181c5370f65285f4bce97c352662 100644
--- a/debian/mariadb-test-5.5.dirs
+++ b/debian/mariadb-test-5.5.dirs
@@ -19,13 +19,6 @@ usr/share/mysql/mysql-test/suite/parts
 usr/share/mysql/mysql-test/suite/parts/inc
 usr/share/mysql/mysql-test/suite/parts/t
 usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/rpl_ndb
-usr/share/mysql/mysql-test/suite/rpl_ndb/t
-usr/share/mysql/mysql-test/suite/rpl_ndb/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
 usr/share/mysql/mysql-test/suite/rpl
 usr/share/mysql/mysql-test/suite/rpl/t
 usr/share/mysql/mysql-test/suite/rpl/r
@@ -47,11 +40,7 @@ usr/share/mysql/mysql-test/suite/jp/r
 usr/share/mysql/mysql-test/suite/jp/include
 usr/share/mysql/mysql-test/suite/jp/std_data
 usr/share/mysql/mysql-test/suite/ndb
-usr/share/mysql/mysql-test/suite/ndb/t
-usr/share/mysql/mysql-test/suite/ndb/r
 usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/maria/t
-usr/share/mysql/mysql-test/suite/maria/r
 usr/share/mysql/mysql-test/suite/funcs_2
 usr/share/mysql/mysql-test/suite/funcs_2/lib
 usr/share/mysql/mysql-test/suite/funcs_2/t
@@ -63,9 +52,6 @@ usr/share/mysql/mysql-test/suite/binlog
 usr/share/mysql/mysql-test/suite/binlog/t
 usr/share/mysql/mysql-test/suite/binlog/r
 usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/ndb_team
-usr/share/mysql/mysql-test/suite/ndb_team/t
-usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors
diff --git a/debian/mariadb-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index 7f5b5ec9a36df177263f3b4b93b25194ba324e91..2242305317b928d1f2c3d6e38648e82964ef1376 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -1,20 +1,9 @@
-# OK to have embedded libraries in test suite
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmariadbclient
-# in modern Debian this xz support exists, this should not matter anymore
-mariadb-test-5.5: data.tar.xz-member-without-dpkg-pre-depends
-# Ask help from upstream to fix these later
+# Embedded from same source is OK
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmysqlclient
+# OK, file part of test suite
 mariadb-test-5.5: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/std_data/checkDBI_DBD-mysql.pl
+# This file is designed to run with 'perl checksum.pl' and is not possible to run directly
 mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/long_tmpdir-master.sh
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/lowercase_mixed_tmpdir-master.sh
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world_schema.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/collections/default.weekly
diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides
deleted file mode 100644
index df3ff694b56ca6f7067be612bba9ce76b1c76dc6..0000000000000000000000000000000000000000
--- a/debian/mariadb-test.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# in modern Debian this xz support exists, this should not matter anymore
-mariadb-test: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff b/debian/patches/33_scripts__mysql_create_system_tables__no_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff b/debian/patches/41_scripts__mysql_install_db.sh__no_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
old mode 100755
new mode 100644
index 16759695bfc87789cffb4b78a6114880abc88e1f..01839f436fc309a20b7bdf8c461c94fd88b7a598
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -1,5 +1,6 @@
-## 99-unnamed.dpatch by  <ch@debian.org>
-## DP: Removes unnecessary library dependencies. See #390692
+Author: Christian Hammers <ch@debian.org>
+Description: Removes unnecessary library dependencies. See #390692
+
 --- old/scripts/mysql_config.sh	2014-04-17 22:07:38.668960760 +0300
 +++ new/scripts/mysql_config.sh	2014-04-17 22:08:33.528958126 +0300
 @@ -107,10 +107,10 @@
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.diff b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/75_man_syntax_fixes.diff b/debian/patches/75_man_syntax_fixes.diff
new file mode 100644
index 0000000000000000000000000000000000000000..c5d1ee357dd115ddc831842f290353812615ee03
--- /dev/null
+++ b/debian/patches/75_man_syntax_fixes.diff
@@ -0,0 +1,20 @@
+Author: Colin Watson <cjwatson@debian.org>
+Description: Fix man page syntax to make package Lintian clean
+
+--- a/man/mysqldump.1
++++ b/man/mysqldump.1
+@@ -2041,12 +2041,12 @@ T}
+ T{
+ \'\' (\fIempty string\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR"></field>
++<field name="\fIcolumn_name\fR">\:</field>
+ T}
+ T{
+ \'NULL\' (\fIstring value\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR">NULL</field>
++<field name="\fIcolumn_name\fR">\:NULL</field>
+ T}
+ .TE
+ .sp 1
diff --git a/debian/patches/82_extend_default_test_timeout_for_tokudb.diff b/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
index d139c3a36fe606ae25b07511093c9f933489b581..4a45d552404d0fe3b29afb4a26b397c788a423e7 100644
--- a/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
+++ b/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
@@ -1,3 +1,6 @@
+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Extend timeout as some Debian pbuilder/sbuilder chroots may be very slow to run these
+
 --- old/mysql-test/CMakeLists.txt	2014-02-12 17:55:23.469136898 +0200
 +++ new/mysql-test/CMakeLists.txt	2014-02-12 17:54:07.471406742 +0200
 @@ -64,7 +64,7 @@
diff --git a/debian/patches/90_spelling.diff b/debian/patches/90_spelling.diff
new file mode 100644
index 0000000000000000000000000000000000000000..4abd52e093720aed6a87b4a1e4c829e7eb04889b
--- /dev/null
+++ b/debian/patches/90_spelling.diff
@@ -0,0 +1,368 @@
+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Fix spelling of preceding, specified, received, additionally
+
+--- a/include/mysql_com.h
++++ b/include/mysql_com.h
+@@ -110,7 +110,7 @@ enum enum_server_command
+ #define MYSQL_TYPE_VIRTUAL 245
+ /*
+   Length of random string sent by server on handshake; this is also length of
+-  obfuscated password, recieved from client
++  obfuscated password, received from client
+ */
+ #define SCRAMBLE_LENGTH 20
+ #define SCRAMBLE_LENGTH_323 8
+--- a/man/mysql-test-run.pl.1
++++ b/man/mysql-test-run.pl.1
+@@ -332,7 +332,7 @@ is defined so that
+ can invoke itself with
+ exec $MYSQL_TEST\&.
+ .PP
+-Other tests may refer to the last three variables listed in the preceeding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
++Other tests may refer to the last three variables listed in the preceding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
+ $MYSQL_TMP_DIR/\fIfile_name\fR\&.
+ .PP
+ If you are running
+--- a/man/mysqldump.1
++++ b/man/mysqldump.1
+@@ -1261,7 +1261,7 @@ to point the slave to the correct master server host\&. Add any such parameters
+ .\" max-allowed-packet option: mysqldump
+ \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
+ .sp
+-Sets the maximum packet length to send to or recieve from server\&.
++Sets the maximum packet length to send to or receive from server\&.
+ .RE
+ .sp
+ .RS 4
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -6489,7 +6489,7 @@ Misc options
+   start-dirty           Only start the servers (without initialization) for
+                         the first specified test case
+   user-args             In combination with start* and no test name, drops
+-                        arguments to mysqld except those speficied with
++                        arguments to mysqld except those specified with
+                         --mysqld (if any)
+   wait-all              If --start or --start-dirty option is used, wait for all
+                         servers to exit before finishing the process
+--- a/mysql-test/r/mysqld--help.result
++++ b/mysql-test/r/mysqld--help.result
+@@ -613,7 +613,7 @@ The following options may be given as the first argument:
+  --relay-log-space-limit=# 
+  Maximum space to use for all relay logs
+  --replicate-annotate-row-events 
+- Tells the slave to write annotate rows events recieved
++ Tells the slave to write annotate rows events received
+  from the master to its own binary log. Ignored if
+  log_slave_updates is not set
+  --replicate-do-db=name 
+--- a/mysql-test/r/ps.result
++++ b/mysql-test/r/ps.result
+@@ -613,8 +613,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+@@ -625,7 +625,7 @@ insert into t4 values("nicke", "imp");
+ prepare stmt from
+ 'select distinct t1.partner_id
+ from t1 left join t3 on t1.id = t3.id
+-     left join t1 pp on pp.id = t3.preceeding_id
++     left join t1 pp on pp.id = t3.preceding_id
+ where
+   exists (
+     select *
+--- a/mysql-test/r/subselect_sj.result
++++ b/mysql-test/r/subselect_sj.result
+@@ -1007,8 +1007,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+--- a/mysql-test/r/subselect_sj_jcl6.result
++++ b/mysql-test/r/subselect_sj_jcl6.result
+@@ -1020,8 +1020,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+--- a/mysql-test/t/ps.test
++++ b/mysql-test/t/ps.test
+@@ -677,8 +677,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ 
+ create table t3 (
+   id int(11) not null default '0',
+-  preceeding_id int(11) not null default '0',
+-  primary key  (id,preceeding_id)
++  preceding_id int(11) not null default '0',
++  primary key  (id,preceding_id)
+ );
+ 
+ create table t4 (
+@@ -692,7 +692,7 @@ insert into t4 values("nicke", "imp");
+ prepare stmt from
+ 'select distinct t1.partner_id
+ from t1 left join t3 on t1.id = t3.id
+-     left join t1 pp on pp.id = t3.preceeding_id
++     left join t1 pp on pp.id = t3.preceding_id
+ where
+   exists (
+     select *
+--- a/mysql-test/t/subselect_sj.test
++++ b/mysql-test/t/subselect_sj.test
+@@ -897,8 +897,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+                       ("4", "1", "sup", "0");
+ create table t3 (
+   id int(11) not null default '0',
+-  preceeding_id int(11) not null default '0',
+-  primary key  (id,preceeding_id)
++  preceding_id int(11) not null default '0',
++  primary key  (id,preceding_id)
+ );
+ 
+ create table t4 (
+--- a/sql/handler.h
++++ b/sql/handler.h
+@@ -1270,7 +1270,7 @@ typedef struct st_ha_create_information
+     For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current").
+ 
+     Can be changed either explicitly by the parser.
+-    If nothing speficied inherits the value of the original table (if present).
++    If nothing specified inherits the value of the original table (if present).
+   */
+   enum row_type row_type;
+   uint null_bits;                       /* NULL bits at start of record */
+--- a/sql/log_event.h
++++ b/sql/log_event.h
+@@ -1860,7 +1860,7 @@ public:
+   bool is_valid() const { return query != 0; }
+ 
+   /*
+-    Returns number of bytes additionaly written to post header by derived
++    Returns number of bytes additionally written to post header by derived
+     events (so far it is only Execute_load_query event).
+   */
+   virtual ulong get_post_header_size_for_derived() { return 0; }
+--- a/sql/password.c
++++ b/sql/password.c
+@@ -425,7 +425,7 @@ void make_scrambled_password(char *to, const char *password)
+ 
+ /*
+     Produce an obscure octet sequence from password and random
+-    string, recieved from the server. This sequence corresponds to the
++    string, received from the server. This sequence corresponds to the
+     password, but password can not be easily restored from it. The sequence
+     is then sent to the server for validation. Trailing zero is not stored
+     in the buf as it is not needed.
+@@ -467,7 +467,7 @@ scramble(char *to, const char *message, const char *password)
+ 
+ /*
+     Check that scrambled message corresponds to the password; the function
+-    is used by server to check that recieved reply is authentic.
++    is used by server to check that received reply is authentic.
+     This function does not check lengths of given strings: message must be
+     null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE
+     long (if not, something fishy is going on).
+--- a/sql/rpl_utility.cc
++++ b/sql/rpl_utility.cc
+@@ -1157,7 +1157,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli)
+ void Deferred_log_events::rewind()
+ {
+   /*
+-    Reset preceeding Query log event events which execution was
++    Reset preceding Query log event events which execution was
+     deferred because of slave side filtering.
+   */
+   if (!is_empty())
+--- a/sql/slave.cc
++++ b/sql/slave.cc
+@@ -3524,7 +3524,7 @@ pthread_handler_t handle_slave_sql(void *arg)
+   set_thd_in_use_temporary_tables(rli);   // (re)set sql_thd in use for saved temp tables
+   /*
+     binlog_annotate_row_events must be TRUE only after an Annotate_rows event
+-    has been recieved and only till the last corresponding rbr event has been
++    has been received and only till the last corresponding rbr event has been
+     applied. In all other cases it must be FALSE.
+   */
+   thd->variables.binlog_annotate_row_events= 0;
+--- a/sql/sql_connect.cc
++++ b/sql/sql_connect.cc
+@@ -704,7 +704,7 @@ static void update_global_user_stats_with_user(THD *thd,
+   user_stats->cpu_time+=   (thd->status_var.cpu_time -
+                             thd->org_status_var.cpu_time); 
+   /*
+-    This is handle specially as bytes_recieved is incremented BEFORE
++    This is handle specially as bytes_received is incremented BEFORE
+     org_status_var is copied.
+   */
+   user_stats->bytes_received+= (thd->org_status_var.bytes_received-
+--- a/sql/sql_prepare.cc
++++ b/sql/sql_prepare.cc
+@@ -74,7 +74,7 @@ When one supplies long data for a placeholder:
+ 
+   - Server gets the long data in pieces with command type
+     'COM_STMT_SEND_LONG_DATA'.
+-  - The packet recieved will have the format as:
++  - The packet received will have the format as:
+     [COM_STMT_SEND_LONG_DATA:1][STMT_ID:4][parameter_number:2][data]
+   - data from the packet is appended to the long data value buffer for this
+     placeholder.
+--- a/sql/sql_select.cc
++++ b/sql/sql_select.cc
+@@ -20444,7 +20444,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
+     Item *view_ref= NULL;
+     /*
+       If we have found field not by its alias in select list but by its
+-      original field name, we should additionaly check if we have conflict
++      original field name, we should additionally check if we have conflict
+       for this name (in case if we would perform lookup in all tables).
+     */
+     if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&
+@@ -21467,7 +21467,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
+          We are replacing the argument of Item_func_set_user_var after its value
+          has been read.  The argument's null_value should be set by now, so we
+          must set it explicitly for the replacement argument since the null_value
+-         may be read without any preceeding call to val_*().
++         may be read without any preceding call to val_*().
+         */
+         new_field->update_null_value();
+         List<Item> list;
+--- a/sql/sys_vars.cc
++++ b/sql/sys_vars.cc
+@@ -3817,7 +3817,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events(
+ #ifdef HAVE_REPLICATION
+ static Sys_var_mybool Sys_replicate_annotate_row_events(
+        "replicate_annotate_row_events",
+-       "Tells the slave to write annotate rows events recieved from the master "
++       "Tells the slave to write annotate rows events received from the master "
+        "to its own binary log. Ignored if log_slave_updates is not set",
+        READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events),
+        CMD_LINE(OPT_ARG), DEFAULT(0));
+--- a/sql/tztime.cc
++++ b/sql/tztime.cc
+@@ -2032,7 +2032,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
+ 
+   /*
+     At last we are doing the same thing for records in
+-    mysql.time_zone_transition table. Here we additionaly need records
++    mysql.time_zone_transition table. Here we additionally need records
+     in ascending order by index scan also satisfies us.
+   */
+   table= tz_tables->table; 
+--- a/storage/maria/ma_rnext.c
++++ b/storage/maria/ma_rnext.c
+@@ -71,7 +71,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
+       Normally SQL layer would never request "search next" if
+       "search first" failed. But HANDLER may do anything.
+ 
+-      As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
++      As mi_rnext() without preceding mi_rkey()/mi_rfirst()
+       equals to mi_rfirst(), we must restore original state
+       as if failing mi_rfirst() was not called.
+     */
+--- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp
++++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
+@@ -63,7 +63,7 @@ class NdbEventOperationImpl;
+  * - Event code does not check table schema version. Make sure to drop events
+  * after table is dropped. Will be fixed in later
+  * versions.
+- * - If a node failure has occured not all events will be recieved
++ * - If a node failure has occured not all events will be received
+  * anymore. Drop NdbEventOperation and Create again after nodes are up
+  * again. Will be fixed in later versions.
+  *
+--- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
++++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
+@@ -163,7 +163,7 @@ namespace NDB_CPC.telnetclient
+ 				}
+ 				else
+ 				{
+-					// If no data was recieved then the connection is probably dead
++					// If no data was received then the connection is probably dead
+ 					Console.WriteLine( "Disconnected", sock.RemoteEndPoint );
+ 					sock.Shutdown( SocketShutdown.Both );
+ 					sock.Close();
+--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
++++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+@@ -10559,7 +10559,7 @@ void Dbtc::releaseAbortResources(Signal* signal)
+ 
+   // MASV let state be CS_ABORTING until all 
+   // signals in the "air" have been received. Reset to CS_CONNECTED
+-  // will be done when a TCKEYREQ with start flag is recieved
++  // will be done when a TCKEYREQ with start flag is received
+   // or releaseApiCon is called
+   // apiConnectptr.p->apiConnectstate = CS_CONNECTED;
+   apiConnectptr.p->apiConnectstate = CS_ABORTING;
+--- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
++++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
+@@ -526,7 +526,7 @@ private:
+   //  we signal with a condition variable to the waiting
+   //  thread (receiveOptimisedResponse) that the signal has arrived.
+   // Parameters:
+-  //  signal: The recieved signal
++  //  signal: The received signal
+   // Returns: -
+   //**************************************************************************
+ 
+--- a/storage/ndb/test/ndbapi/testDict.cpp
++++ b/storage/ndb/test/ndbapi/testDict.cpp
+@@ -942,7 +942,7 @@ int runStoreFrm(NDBT_Context* ctx, NDBT_Step* step){
+     
+     // Verfiy the frm data
+     if (memcmp(pData, pData2, resultLen) != 0){
+-      g_err << "Wrong data recieved" << endl;
++      g_err << "Wrong data received" << endl;
+       for (size_t i = 0; i < dataLen; i++){
+ 	unsigned char c = ((unsigned char*)pData2)[i];
+ 	g_err << hex << c << ", ";
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+@@ -42,7 +42,7 @@ void ColAtt_DisplayError(SQLSMALLINT ColAtt_HandleType,
+  * Test returning descriptor information
+  *
+  * Tests:
+- * -# Call SQLColAttribute, without preceeding SQLPrepare
++ * -# Call SQLColAttribute, without preceding SQLPrepare
+  * -# ???
+  * 
+  * @return Zero, if test succeeded
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+@@ -42,7 +42,7 @@ void ColAtt_DisplayErrorTest2(SQLSMALLINT ColAttTest2_HandleType,
+  * Test returning descriptor information
+  *
+  * Test:
+- * -# Call SQLColAttribute without preceeding SQLExecute
++ * -# Call SQLColAttribute without preceding SQLExecute
+  * -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
+  * -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
+  * -# FieldIdentifer is not one of the code valuess in Table 20
+--- a/storage/xtradb/fil/fil0fil.c
++++ b/storage/xtradb/fil/fil0fil.c
+@@ -3946,7 +3946,7 @@ func_exit:
+ 		page_no = dict_index_get_page(index);
+ 		ut_a(page_no == 3);
+ 
+-		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionaly on buffer pool.\n");
++		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionally on buffer pool.\n");
+ 
+ 		/* down to leaf */
+ 		mtr_start(&mtr);
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
old mode 100755
new mode 100644
index cabfe0e502f7b6bfd0eb8d309a1e390c8a44ab0e..3add5c72dccd5af0a4f4ba594c753a8cfd663da2
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -1,4 +1,5 @@
-## DP: Remove hackish upstream manipulation of debian/* contents
+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Remove upstream debian/* handling that is obsolete
 
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 20f2f9aec27bc75849d004c147ab52853d36f3ca..cb88f05d40eba9be633349dacead1e19bfacf121 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,7 @@
 44_scripts__mysql_config__libs.diff
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
+75_man_syntax_fixes.diff
 82_extend_default_test_timeout_for_tokudb.diff
+90_spelling.diff
 99_remove_rename_mariadb-server_files_in.diff
diff --git a/debian/po/it.po b/debian/po/it.po
index 6ba0ab195a7bd3090459565de4ae9915ed70ea97..b6cdfd667bcbaba8eb0425ce53fb795e2e71ba98 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,14 +1,13 @@
-# Italian (it) translation of debconf templates for mysql-dfsg-5.1
-# Copyright (C) 2009 Software in the Public Interest
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
+# Italian (it) translation of debconf templates for mariadb-5.5
+# This file is distributed under the same license as the mariadb-5.5 package.
+# Luca Monducci <luca.mo@tiscali.it>, 2006-2014.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
+"Project-Id-Version: mariadb-5.5 5.5.39 italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2009-08-08 11:03+0200\n"
+"PO-Revision-Date: 2014-08-30 18:35+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -46,8 +45,8 @@ msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
-"Non è garantito che la versione che si sta installando sia in grado di usare "
-"i database presenti."
+"Non è garantito che la versione che sta per essere installata sia in grado "
+"di usare i database presenti."
 
 #. Type: note
 #. Description
@@ -62,8 +61,8 @@ msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema locale un "
-"account utente per mysql con:"
+"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema un account "
+"utente locale con nome mysql con:"
 
 #. Type: note
 #. Description
@@ -72,8 +71,8 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Inoltre si devono verificare i permessi e la proprietà della directory /var/"
-"lib/mysql:"
+"Inoltre è opportuno verificare i permessi e la proprietà della directory /"
+"var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -88,8 +87,8 @@ msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
 msgstr ""
-"La directory /var/lib/mysql contenente i database di MariaDB sta per essere "
-"eliminata."
+"La directory /var/lib/mysql che contiene i database di MariaDB sta per "
+"essere eliminata."
 
 #. Type: boolean
 #. Description
@@ -116,7 +115,7 @@ msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
 msgstr ""
-"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per "
+"Anche se non è obbligatorio, si raccomanda d'impostare una password per "
 "l'utente d'amministrazione «root» di MariaDB."
 
 #. Type: password
@@ -160,15 +159,11 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:7001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
 "more information."
 msgstr ""
-"Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-"
+"Per maggiori informazioni consultare il file /usr/share/doc/mariadb-"
 "server-5.5/README.Debian."
 
 #. Type: error
@@ -187,7 +182,7 @@ msgstr "Le due password inserite sono diverse. Riprovare."
 #. Description
 #: ../mariadb-server-5.5.templates:9001
 msgid "NDB Cluster seems to be in use"
-msgstr "È in uso un cluster NDB"
+msgstr "È in uso NDB Cluster"
 
 #. Type: error
 #. Description
@@ -197,15 +192,15 @@ msgid ""
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
-"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
-"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."
+"MySQL-5.1 non fornisce più il supporto per NDB Cluster. Migrare al nuovo "
+"pacchetto mysql-cluster e rimuovere tutte le righe che iniziano per \"ndb\" "
+"da ogni file di configurazione sotto /etc/mysql/."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:10001
 msgid "Really migrate to MariaDB?"
-msgstr ""
+msgstr "Migrare a MariaDB?"
 
 #. Type: boolean
 #. Description
@@ -214,6 +209,8 @@ msgid ""
 "MariaDB is a drop-in replacement for MySQL. It will use your current "
 "configuration file (my.cnf) and current databases."
 msgstr ""
+"MariaDB è un perfetto sostituto per MySQL. Utilizzerà l'attuale file di "
+"configurazione (my.cnf) e i database presenti."
 
 #. Type: boolean
 #. Description
@@ -223,13 +220,6 @@ msgid ""
 "and thus migration back to MySQL might not always work, at least not as "
 "automatically as migrating from MySQL to MariaDB."
 msgstr ""
-
-#~ msgid "Start the MariaDB server on boot?"
-#~ msgstr "Lanciare il server MariaDB all'avvio?"
-
-#~ msgid ""
-#~ "The MariaDB server can be launched automatically at boot time or manually "
-#~ "with the '/etc/init.d/mysql start' command."
-#~ msgstr ""
-#~ "Il server MariaDB può essere lanciato automaticamente all'avvio del "
-#~ "sistema oppure manualmente con il comando «/etc/init.d/mysql start»."
+"Notare che MariaDB dispone di alcune funzionalità avanzate che non esistono "
+"in MySQL, di conseguenza non sempre funziona la migrazione all'indietro "
+"verso MySQL, o almeno non è automatica come la migrazione da MySQL a MariaDB."
diff --git a/debian/rules b/debian/rules
index ce817d6f5547bc828bd13668b58a7ea1380cb35b..10ba523515f98e86c675d819de97ea8dc1da84db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,11 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
     TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
 endif
 
+# Disable TokuDB due to failing test suite
+# TokuDB is disabled in Trusty and can very well 
+# be disabled in Utopic too
+TOKUDB_OPT:=-DWITHOUT_TOKUDB=true
+
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
@@ -29,6 +34,22 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DISTRIBUTION := $(shell lsb_release -i -s)
 RELEASE := $(shell lsb_release -r -s)
 
+# Parallel build support as adviced
+# at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    # Placeholder code to implement max cpu count value checking
+    # if [$(NUMJOBS) > $(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)]
+    #  then NUMJOBS = 0
+    # fi
+    MAKEFLAGS += -j $(NUMJOBS)
+endif
+
+# Add support for verbose builds
+ifneq (,$(filter verbose,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += VERBOSE=1
+endif
+
 MAKE_TEST_TARGET:=test-force
 ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team
@@ -62,19 +83,22 @@ override_dh_auto_clean:
 	dh_testroot
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	rm -rf $(BUILDDIR)
-	debconf-updatepo
-
-override_dh_auto_configure: configure-stamp
+	debconf-updatepo # Update po-files when clean runs before each build
 
 override_dh_prep:
         # Don't clean /tmp/ away, it is needed by all binary packages
 
-# We explicitly set -DINSTALL_SUPPORTFILESDIR as it is incorrect in upstream
-# sources (will be fixed in 5.5.30).
-configure-stamp:
+override_dh_auto_configure:
 	@echo "RULES.$@"
 	dh_testdir
 	
+	# Versioned symbols are only available on Linux.
+	# Remove symbols file on kFreeBSD builds so that
+	# dpkg-gensymbols will not fail the build.
+ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64))
+	rm debian/libmariadbclient18.symbols
+endif
+	
 	# Rename shared libraries SONAME and filenames
 	# libmysqlclient18.so > libmariadbclient18.so etc
 	sed -i 's/mysqlclient/mariadbclient/g' client/CMakeLists.txt tests/CMakeLists.txt scripts/CMakeLists.txt
@@ -86,56 +110,45 @@ configure-stamp:
 	# Neither does RPM packaging related files or comments in other code need sedding.
 	
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
-	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
 		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-		$(USE_STATIC_MYSQLD) \
+	    $(USE_STATIC_MYSQLD) \
+	    -$(MAKEFLAGS) \
+	    $(TOKUDB_OPT) \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
-	    -DWITHOUT_TOKUDB=true \
 	    -DBUILD_CONFIG=mysql_release \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-	    -DINSTALL_SUPPORTFILESDIR=share/mysql \
 		-DDEB=1 ..'
 	touch $@
 
-# Disable TokuDB above due to
-# * i386 does not work and CMakeLists.txt check for processor does not detect
-#   correct ARCH in chroot
-# * Build errors in Trusty: https://mariadb.atlassian.net/browse/MDEV-5618
-# * There was ugly code in CMakeLists.txt that touched stuff in debian/*
-#   that needs to be re-written
-
-override_dh_auto_build: build-stamp
-
-build-stamp:
+# This is needed, otherwise 'make test' will run before binaries have been built
+override_dh_auto_build:
 	@echo "RULES.$@"
-	cd $(builddir) && $(MAKE) $(AM_EXTRA_MAKEFLAGS)
+	cd $(builddir) && $(MAKE)
 	touch $@
 
 override_dh_auto_test:
 	@echo "RULES.$@"
-ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ;
 endif
 
-override_dh_auto_install: auto_install-stamp
-
-auto_install-stamp:
+override_dh_auto_install:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
 	
-	# some self written manpages which hopefully
-	# gets overwritten sooner or later with upstreams
-	mkdir -p $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/usr/share/man/man8/
-	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
+	# If TokuDB plugin was built
+	# add it to the server install list.
+	[ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md' >> debian/mariadb-server-5.5.install
+	
 	mkdir -p $(TMP)/etc/mysql/conf.d/
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	
@@ -159,11 +172,6 @@ auto_install-stamp:
 	install -d $(TMP)/etc/mysql/conf.d
 	install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
 	
-	# mariadb-client
-	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
-	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
-	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
-	
 	# mariadb-server
 	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
 	       $(TMP)/usr/share/mysql/mysql-log-rotate \
@@ -180,6 +188,12 @@ auto_install-stamp:
 	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
 	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
 	
+	# install AppArmor profile
+	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
+	
+	# install Apport hook
+	install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
+	
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql
 	touch $@
@@ -195,14 +209,6 @@ override_dh_installinit-arch:
 override_dh_installcron-arch:
 	dh_installcron --name mysql-server
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
-binary:	binary-indep binary-arch
-
-get-orig-source:
-	uscan --force-download --verbose
-
 %:
 	dh $@ --parallel
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index aff65fe81c7ee896cd22a449196d0c8eb1f9e7e7..93a39ce4c7f4cf757795f7a28df62056a416671f 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1 +1,7 @@
+# The mysql-server-5.6.postrm script handles
+# what debhelper normally would.
+# This is apparently related to #526464.
 maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm
+# File is multi-licensed, and thus should be OK for Debian
+license-problem-non-free-RFC include/sha1.h
+license-problem-non-free-RFC mysys/sha1.c
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000000000000000000000000000000000000..135d675f22ccdc69bc3e5d83d5d32894435cce12
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,21 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis
+497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM
+LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8
+p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn
+U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb
+XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j
+zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx
+cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H
+48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ
+YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu
+b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3
+kRbTlojzCd20Q0RhbmllbCBCYXJ0aG9sb21ldyAoTW9udHkgUHJvZ3JhbSBzaWdu
+aW5nIGtleSkgPGRiYXJ0QGFza21vbnR5Lm9yZz6IYAQTEQIAIAUCS2iEkAIbAwYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMvLCCobuUPboDgAoNQVrK4i5LXTgwnW
+ke2MxsXCoHDnAJ93j733YuNkV64aHEUwWxNCkkwUkQ==
+=WMk8
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index a58143bf6704304f80e85100634086a97385a0a8..8ff7cb27cb323e889846496dd5623dd37da739ad 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,15 @@
 version=3
-opts="uversionmangle=s/-(rc|beta)/$1/" \
-   ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.5.([\d\.]*(?:-beta|-rc)?)/kvm-tarbake-jaunty-x86/mariadb-([\d\.]*(?:-beta|-rc)?).tar.gz \
-   debian uupdate
+opts=pgpsigurlmangle=s/$/.asc/ \
+ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/mariadb-5.5.([\d\.]*).tar.gz \
+debian uupdate
+
+# Simplified watch file still does not work
+#$ uscan --no-download --verbose --debug
+#uscan debug: requesting URL ftp://ftp.ddg.lth.se/mariadb/
+# ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/ failed: 400 FTP return code 000
 
 # Added string "-5.5." in path as MariaDB has release series 5.5 and 10.x in parallel,
 # and we want uscan to check for updates only in the 5-series.
+
+# Automated signature checking with pgpsigurlmangle has been available
+# only since devscripts version 2.13.3