[Pkg-mysql-commits] [mariadb-5.5] 01/02: Imported debian*/ from 5.5.40-0ubuntu0.14.04.1

Otto Kekäläinen ottok-guest at moszumanska.debian.org
Tue Jan 27 15:18:31 UTC 2015


This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.

commit a4e1c52fe9885a0d3ce2c28053437cf0ccdf2b03
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Mon Dec 29 00:25:02 2014 +0200

    Imported debian*/ from 5.5.40-0ubuntu0.14.04.1
---
 debian/README.Maintainer                           |  176 +---
 debian/additions/mysql_tableinfo.1                 |  322 ++++++
 debian/autobake-deb.sh                             |   37 +
 debian/changelog                                   |  122 +--
 debian/control                                     |   24 +-
 debian/copyright                                   |  162 +--
 debian/dist/Debian/control                         |  250 -----
 debian/{ => dist/Ubuntu}/apparmor-profile          |    0
 debian/dist/Ubuntu/control                         |  244 -----
 debian/dist/Ubuntu/mariadb-server-5.5.files.diff   |    9 +
 debian/dist/Ubuntu/mariadb-server-5.5.files.in     |   77 --
 .../dist/Ubuntu/mariadb-server-5.5.postinst.diff   |   37 +
 debian/dist/Ubuntu/mariadb-server-5.5.postrm.diff  |   10 +
 debian/{ => dist/Ubuntu}/mariadb-server-5.5.py     |   22 +-
 debian/gbp.conf                                    |    3 -
 debian/libmariadbclient-dev.install                |    4 +-
 debian/libmariadbclient-dev.lintian-overrides      |    2 +
 debian/libmariadbclient18.lintian-overrides        |    4 +-
 debian/libmariadbclient18.symbols                  | 1032 +++++++++++++++++++-
 debian/libmariadbd-dev.lintian-overrides           |    9 +-
 debian/mariadb-client-5.5.links                    |    3 -
 debian/mariadb-client-5.5.lintian-overrides        |   11 +-
 debian/mariadb-client-5.5.manpages                 |    2 +-
 debian/mariadb-client-5.5.menu                     |    2 +-
 debian/mariadb-client-core-5.5.lintian-overrides   |    4 +-
 debian/mariadb-client.lintian-overrides            |    3 +
 debian/mariadb-common.lintian-overrides            |    3 +
 debian/mariadb-server-5.5.config                   |    2 +-
 debian/mariadb-server-5.5.dirs                     |    2 +
 debian/mariadb-server-5.5.install                  |   24 +-
 debian/mariadb-server-5.5.lintian-overrides        |   20 +-
 debian/mariadb-server-5.5.manpages                 |    9 +-
 debian/mariadb-server-5.5.mysql-server.logrotate   |    8 +-
 debian/mariadb-server-5.5.postinst                 |   23 +-
 debian/mariadb-server-5.5.postrm                   |   21 +-
 debian/mariadb-server-5.5.preinst                  |   27 +-
 debian/mariadb-server-core-5.5.lintian-overrides   |    3 +-
 debian/mariadb-server.lintian-overrides            |    2 +
 debian/mariadb-test-5.5.dirs                       |   14 +
 debian/mariadb-test-5.5.lintian-overrides          |   17 +-
 debian/mariadb-test.lintian-overrides              |    2 +
 debian/patches/31_fix_replace_lookup_path.diff     |   22 -
 ...ripts__mysql_create_system_tables__no_test.diff |    0
 .../38_scripts__mysqld_safe.sh__signals.diff       |    0
 .../41_scripts__mysql_install_db.sh__no_test.diff  |    0
 debian/patches/44_scripts__mysql_config__libs.diff |    5 +-
 debian/patches/50_mysql-test__db_test.diff         |    2 +-
 .../61_replace_dash_with_bash_mbug675185.diff      |    0
 debian/patches/75_man_syntax_fixes.diff            |   20 -
 .../82_extend_default_test_timeout_for_tokudb.diff |    3 -
 .../99_remove_rename_mariadb-server_files_in.diff  |    5 +-
 debian/patches/series                              |    2 -
 debian/po/it.po                                    |   60 +-
 debian/po/nl.po                                    |  194 +++-
 debian/rules                                       |   92 +-
 debian/source.lintian-overrides                    |    6 -
 debian/upstream/signing-key.asc                    |   21 -
 debian/watch                                       |    7 +-
 58 files changed, 1879 insertions(+), 1308 deletions(-)

diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index a394727..eab724f 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -1,32 +1,4 @@
-# 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 ###
+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
@@ -34,150 +6,4 @@ If the build fails the easiest way to clean up before a new run is
 
     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 at 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 at 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 b [...]
-
-## 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
new file mode 100644
index 0000000..1de4f5d
--- /dev/null
+++ b/debian/additions/mysql_tableinfo.1
@@ -0,0 +1,322 @@
+.\" 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 at 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/autobake-deb.sh b/debian/autobake-deb.sh
index 9210c20..3ee877a 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -27,7 +27,44 @@ 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 1b61d34..4cdb489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,78 +1,50 @@
-mariadb-5.5 (5.5.41-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Otto Kekäläinen <otto at seravo.fi>  Sat, 27 Dec 2014 15:59:46 +0200
-
-mariadb-5.5 (5.5.39-3) UNRELEASED; urgency=low
-
-  * Updated Dutch translation by Frans Spiesschaert (Closes: #764010)
-  * Updated control file so that mariadb-client-5.5 breaks and replaces
-    the package mariadb-server-5.5 to allow overwriting the innochecksum
-    man page file which has changed location (LP: #1368124) as per
-    doc https://www.debian.org/doc/debian-policy/ch-relationships.html#s7.6.1
-  * Backported the fix of #770177 from 10.0 to 5.5 so that the migration
-    question will not be asked repeatedly.
-
- -- Otto Kekäläinen <otto at seravo.fi>  Sat, 04 Oct 2014 22:45:02 +0300
-
-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)
-  * Set migration option as unseen if installation was aborted (Closes: #761452)
-
- -- Otto Kekäläinen <otto at 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 at 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 at 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 at seravo.fi>  Thu, 17 Apr 2014 20:55:22 +0300
+mariadb-5.5 (5.5.40-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
+    - CVE-2014-6507
+    - CVE-2014-6491
+    - CVE-2014-6500
+    - CVE-2014-6469
+    - CVE-2014-6555
+    - CVE-2014-6559
+    - CVE-2014-6494
+    - CVE-2014-6496
+    - CVE-2014-6464
+  * Add bsdutils as mariadb-server dependency like upstream does in 5.5.40.
+
+ -- Otto Kekäläinen <otto at 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 at 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 at seravo.fi>  Mon, 28 Apr 2014 09:55:22 +0300
 
 mariadb-5.5 (5.5.36-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index db7c476..cb631f3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mariadb-5.5
 Section: database
 Priority: optional
-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Otto Kekäläinen <otto at seravo.fi>,
            Clint Byrum <clint at ubuntu.com>,
            James Page <jamespage at debian.org>
@@ -12,7 +13,7 @@ Build-Depends: bison,
                dh-apparmor,
                hardening-wrapper,
                libaio-dev [linux-any],
-               libjemalloc-dev (>= 3.0.0) [linux-any],
+               libjemalloc-dev [linux-any],
                libncurses5-dev (>= 5.0-6),
                libpam0g-dev,
                libreadline-gplv2-dev,
@@ -25,8 +26,8 @@ Build-Depends: bison,
                zlib1g-dev (>= 1:1.1.3-5)
 Standards-Version: 3.9.5
 Homepage: http://mariadb.org/
-Vcs-Git: git://anonscm.debian.org/pkg-mysql/mariadb-5.5.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mysql/mariadb-5.5.git
+Vcs-Git: git://git.debian.org/git/pkg-mysql/mariadb-5.5.git
+Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mariadb-5.5.git
 
 Package: libmariadbclient18
 Section: libs
@@ -125,16 +126,8 @@ Depends: debianutils (>=1.6),
          ${shlibs:Depends}
 Recommends: libdbd-mysql-perl (>= 1.2202)
 Conflicts: mysql-client-core-5.5, mysql-client-core-5.6
-Breaks: mariadb-server-5.5 (<< ${source:Version}),
-        mysql-client,
-        mysql-client-5.5,
-        mysql-client-5.6,
-        virtual-mysql-client
-Replaces: mariadb-server-5.5 (<< ${source:Version}),
-          mysql-client,
-          mysql-client-5.5,
-          mysql-client-5.6,
-          virtual-mysql-client
+Breaks: mysql-client, mysql-client-5.5, mysql-client-5.6, virtual-mysql-client
+Replaces: mysql-client, mysql-client-5.5, mysql-client-5.6, virtual-mysql-client
 Provides: virtual-mysql-client
 Description: MariaDB database client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -193,7 +186,8 @@ Architecture: any
 Suggests: mailx, mariadb-test, tinyca
 Recommends: libhtml-template-perl
 Pre-Depends: adduser (>= 3.40), debconf, mariadb-common
-Depends: libdbi-perl,
+Depends: bsdutils,
+         libdbi-perl,
          lsb-base (>= 3.0-10),
          mariadb-client-5.5 (>= ${source:Version}),
          mariadb-server-core-5.5 (>= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index a7419f9..3cb324d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -772,30 +772,35 @@ 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 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.
+ This file is part of GNU Readline, a library for reading lines
+ of text with interactive input and history editing.
  .
- 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.
+ 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.
+ .
+ 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. */
  .
  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
@@ -872,134 +877,7 @@ License: BSD-4-clause
  POSSIBILITY OF SUCH DAMAGE.
 
 License: 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
-
+ See file /usr/share/common-licenses/Artistic
 
 License: public-domain
  The work is public domain (no license).
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
deleted file mode 100644
index 104917d..0000000
--- a/debian/dist/Debian/control
+++ /dev/null
@@ -1,250 +0,0 @@
-Source: mariadb-5.5
-Section: misc
-Priority: optional
-Maintainer: MariaDB Developers <maria-developers at lists.launchpad.net>
-XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
-Uploaders: MariaDB Developers <maria-developers at 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, libjemalloc-dev (>= 3.0.0)
-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), bsdutils,
-         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/apparmor-profile b/debian/dist/Ubuntu/apparmor-profile
similarity index 100%
rename from debian/apparmor-profile
rename to debian/dist/Ubuntu/apparmor-profile
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
deleted file mode 100644
index 0c33163..0000000
--- a/debian/dist/Ubuntu/control
+++ /dev/null
@@ -1,244 +0,0 @@
-Source: mariadb-5.5
-Section: misc
-Priority: optional
-Maintainer: MariaDB Developers <maria-developers at lists.launchpad.net>
-XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
-Uploaders: MariaDB Developers <maria-developers at 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, libjemalloc-dev (>= 3.0.0)
-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), bsdutils,
-         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
new file mode 100644
index 0000000..bdd9a4e
--- /dev/null
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files.diff
@@ -0,0 +1,9 @@
+*** 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
deleted file mode 100644
index 06a6643..0000000
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files.in
+++ /dev/null
@@ -1,77 +0,0 @@
-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
- at 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
new file mode 100644
index 0000000..0c36048
--- /dev/null
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.postinst.diff
@@ -0,0 +1,37 @@
+*** 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
new file mode 100644
index 0000000..0806382
--- /dev/null
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.postrm.diff
@@ -0,0 +1,10 @@
+*** 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/mariadb-server-5.5.py b/debian/dist/Ubuntu/mariadb-server-5.5.py
similarity index 66%
rename from debian/mariadb-server-5.5.py
rename to debian/dist/Ubuntu/mariadb-server-5.5.py
index ebfc3c0..a1372a3 100644
--- a/debian/mariadb-server-5.5.py
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.py
@@ -4,7 +4,6 @@
 Author: Mathias Gug <mathias.gug at canonical.com>
 '''
 
-from __future__ import print_function, unicode_literals
 import os, os.path
 
 from apport.hookutils import *
@@ -30,23 +29,24 @@ def add_info(report):
                 report[key] += line + '\n'
         except IndexError:
             continue
-    if os.path.exists('/var/log/mysql/error.log'):
-        key = 'Logs' + path_to_key('/var/log/mysql/error.log')
-        report[key] = ""
-        for line in read_file('/var/log/mysql/error.log').split('\n'):
-            report[key] += line + '\n'
-    attach_mac_events(report, '/usr/sbin/mysqld')
-    attach_file(report,'/etc/apparmor.d/usr.sbin.mysqld')
+    key = 'Logs' + path_to_key('/var/log/kern.log')
+    report[key] = ""
+    for line in read_file('/var/log/kern.log').split('\n'):
+        try:
+            if '/usr/sbin/mysqld' in string.join(line.split()[4:]):
+                report[key] += line + '\n'
+        except IndexError:
+            continue
     _add_my_conf_files(report, '/etc/mysql/my.cnf')
     for f in os.listdir('/etc/mysql/conf.d'):
         _add_my_conf_files(report, os.path.join('/etc/mysql/conf.d', f))
     try:
-        report['MySQLVarLibDirListing'] = str(os.listdir('/var/lib/mysql'))
+        report['MySQLVarLibDirListing'] = unicode(os.listdir('/var/lib/mysql'))
     except OSError:
-        report['MySQLVarLibDirListing'] = str(False)
+        report['MySQLVarLibDirListing'] = unicode(False)
 
 if __name__ == '__main__':
     report = {}
     add_info(report)
     for key in report:
-        print('%s: %s' % (key, report[key].split('\n', 1)[0]))
+        print '%s: %s' % (key, report[key].split('\n', 1)[0])
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index bd69fd3..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-debian-branch = master
-pristine-tar = True
diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install
index 4e4ad0a..b18f2d5 100644
--- a/debian/libmariadbclient-dev.install
+++ b/debian/libmariadbclient-dev.install
@@ -1,8 +1,6 @@
 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
new file mode 100644
index 0000000..ea9a8d9
--- /dev/null
+++ b/debian/libmariadbclient-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# 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 06b348c..6252cc1 100644
--- a/debian/libmariadbclient18.lintian-overrides
+++ b/debian/libmariadbclient18.lintian-overrides
@@ -1,5 +1,7 @@
-# OK, file names don't conflict with the MySQL version
+# Ok as long as 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 fb04895..9a91322 100644
--- a/debian/libmariadbclient18.symbols
+++ b/debian/libmariadbclient18.symbols
@@ -2,377 +2,1341 @@ dialog.so libmariadbclient18 #MINVER#
  _mysql_client_plugin_declaration_ at Base 5.5.35
  get_tty_password_buff at Base 5.5.35
 libmariadbclient.so.18 libmariadbclient18 #MINVER#
+#MISSING: 5.5.36# PSI_hook at Base 5.5.35
+#MISSING: 5.5.36# PSI_server at Base 5.5.35
+#MISSING: 5.5.36# THR_COND_threads at Base 5.5.35
+#MISSING: 5.5.36# THR_KEY_mysys at Base 5.5.35
  THR_KEY_mysys at libmariadbclient_16 5.5.36
  THR_KEY_mysys at libmariadbclient_18 5.5.36
- alloc_dynamic at libmariadbclient_18 5.5.37
- alloc_root at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# THR_LOCK_charset at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_heap at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_isam at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_lock at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_malloc at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_myisam at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_myisam_mmap at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_net at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_open at Base 5.5.35
+#MISSING: 5.5.36# THR_LOCK_threads at Base 5.5.35
+#MISSING: 5.5.36# THR_thread_count at Base 5.5.35
+#MISSING: 5.5.36# TIME_to_double at Base 5.5.35
+#MISSING: 5.5.36# TIME_to_ulonglong at Base 5.5.35
+#MISSING: 5.5.36# TIME_to_ulonglong_date at Base 5.5.35
+#MISSING: 5.5.36# TIME_to_ulonglong_datetime at Base 5.5.35
+#MISSING: 5.5.36# TIME_to_ulonglong_time at Base 5.5.35
+#MISSING: 5.5.36# _dig_vec_lower at Base 5.5.35
+#MISSING: 5.5.36# _dig_vec_upper at Base 5.5.35
+#MISSING: 5.5.36# _my_sig_remember at Base 5.5.35
+#MISSING: 5.5.36# _my_signals at Base 5.5.35
+#MISSING: 5.5.36# _my_thread_var at Base 5.5.35
+#MISSING: 5.5.36# add_compiled_collation at Base 5.5.35
+#MISSING: 5.5.36# all_charsets at Base 5.5.35
+#MISSING: 5.5.36# alloc_dynamic at Base 5.5.35
+ alloc_dynamic at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# alloc_root at Base 5.5.35
+ alloc_root at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# allocate_dynamic at Base 5.5.35
+#MISSING: 5.5.36# array_append_string_unique at Base 5.5.35
+#MISSING: 5.5.36# bchange at Base 5.5.35
+#MISSING: 5.5.36# bin2decimal at Base 5.5.35
+#MISSING: 5.5.36# bmove_upp at Base 5.5.35
+#MISSING: 5.5.36# calc_daynr at Base 5.5.35
+#MISSING: 5.5.36# calc_days_in_year at Base 5.5.35
+#MISSING: 5.5.36# cant_connect_sqlstate at Base 5.5.35
+#MISSING: 5.5.36# charsets at Base 5.5.35
+#MISSING: 5.5.36# charsets_dir at Base 5.5.35
+#MISSING: 5.5.36# check_date at Base 5.5.35
+#MISSING: 5.5.36# check_scramble at Base 5.5.35
+#MISSING: 5.5.36# check_scramble_323 at Base 5.5.35
+#MISSING: 5.5.36# check_time_range at Base 5.5.35
+#MISSING: 5.5.36# cleanup_dirname at Base 5.5.35
+#MISSING: 5.5.36# cli_advanced_command at Base 5.5.35
+#MISSING: 5.5.36# cli_list_fields at Base 5.5.35
+#MISSING: 5.5.36# cli_read_binary_rows at Base 5.5.35
+#MISSING: 5.5.36# cli_read_change_user_result at Base 5.5.35
+#MISSING: 5.5.36# cli_read_prepare_result at Base 5.5.35
+#MISSING: 5.5.36# cli_read_rows at Base 5.5.35
+#MISSING: 5.5.36# cli_read_statistics at Base 5.5.35
+#MISSING: 5.5.36# cli_safe_read at Base 5.5.35
+#MISSING: 5.5.36# cli_stmt_execute at Base 5.5.35
+#MISSING: 5.5.36# cli_unbuffered_fetch at Base 5.5.35
+#MISSING: 5.5.36# client_errors at Base 5.5.35
  client_errors at libmariadbclient_16 5.5.36
  client_errors at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# compiled_charsets at Base 5.5.35
+#MISSING: 5.5.36# convert_dirname at Base 5.5.35
+#MISSING: 5.5.36# copy_typelib at Base 5.5.35
+#MISSING: 5.5.36# create_random_string at Base 5.5.35
+#MISSING: 5.5.36# curr_dir at Base 5.5.35
+#MISSING: 5.5.36# days_in_month at Base 5.5.35
+#MISSING: 5.5.36# debug_sync_C_callback_ptr at Base 5.5.35
+#MISSING: 5.5.36# decimal2bin at Base 5.5.35
+#MISSING: 5.5.36# decimal2double at Base 5.5.35
+#MISSING: 5.5.36# decimal2longlong at Base 5.5.35
+#MISSING: 5.5.36# decimal2string at Base 5.5.35
+#MISSING: 5.5.36# decimal2ulonglong at Base 5.5.35
+#MISSING: 5.5.36# decimal_actual_fraction at Base 5.5.35
+#MISSING: 5.5.36# decimal_add at Base 5.5.35
+#MISSING: 5.5.36# decimal_bin_size at Base 5.5.35
+#MISSING: 5.5.36# decimal_cmp at Base 5.5.35
+#MISSING: 5.5.36# decimal_div at Base 5.5.35
+#MISSING: 5.5.36# decimal_intg at Base 5.5.35
+#MISSING: 5.5.36# decimal_is_zero at Base 5.5.35
+#MISSING: 5.5.36# decimal_mod at Base 5.5.35
+#MISSING: 5.5.36# decimal_mul at Base 5.5.35
+#MISSING: 5.5.36# decimal_result_size at Base 5.5.35
+#MISSING: 5.5.36# decimal_round at Base 5.5.35
+#MISSING: 5.5.36# decimal_shift at Base 5.5.35
+#MISSING: 5.5.36# decimal_size at Base 5.5.35
+#MISSING: 5.5.36# decimal_sub at Base 5.5.35
+#MISSING: 5.5.36# default_charset_info at Base 5.5.35
  default_charset_info at libmariadbclient_16 5.5.36
  default_charset_info at libmariadbclient_18 5.5.36
- delete_dynamic at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# default_client_charset_info at Base 5.5.35
+#MISSING: 5.5.36# delete_dynamic at Base 5.5.35
+ delete_dynamic at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# delete_dynamic_element at Base 5.5.35
+#MISSING: 5.5.36# directory_file_name at Base 5.5.35
+#MISSING: 5.5.36# dirname_length at Base 5.5.35
+#MISSING: 5.5.36# dirname_part at Base 5.5.35
+#MISSING: 5.5.36# disabled_my_option at Base 5.5.35
+#MISSING: 5.5.36# do_mini_left_shift at Base 5.5.35
+#MISSING: 5.5.36# do_mini_right_shift at Base 5.5.35
+#MISSING: 5.5.36# double2decimal at Base 5.5.35
+#MISSING: 5.5.36# dynamic_column_create at Base 5.5.35
  dynamic_column_create at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_create_many at Base 5.5.35
  dynamic_column_create_many at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_delete at Base 5.5.35
  dynamic_column_delete at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_exists at Base 5.5.35
  dynamic_column_exists at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_get at Base 5.5.35
  dynamic_column_get at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_list at Base 5.5.35
  dynamic_column_list at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_prepare_decimal at Base 5.5.35
  dynamic_column_prepare_decimal at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_update at Base 5.5.35
  dynamic_column_update at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# dynamic_column_update_many at Base 5.5.35
  dynamic_column_update_many at libmariadbclient_18 5.5.36
- dynstr_append at libmariadbclient_18 5.5.37
- dynstr_append_mem at libmariadbclient_18 5.5.37
- dynstr_append_os_quoted at libmariadbclient_18 5.5.37
- dynstr_free at libmariadbclient_18 5.5.37
- dynstr_realloc at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# dynstr_append at Base 5.5.35
+ dynstr_append at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# dynstr_append_mem at Base 5.5.35
+ dynstr_append_mem at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# dynstr_append_os_quoted at Base 5.5.35
+ dynstr_append_os_quoted at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# dynstr_free at Base 5.5.35
+ dynstr_free at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# dynstr_realloc at Base 5.5.35
+ dynstr_realloc at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# dynstr_reassociate at Base 5.5.35
+#MISSING: 5.5.36# dynstr_set at Base 5.5.35
+#MISSING: 5.5.36# dynstr_trunc at Base 5.5.35
+#MISSING: 5.5.36# enabled_my_option at Base 5.5.35
+#MISSING: 5.5.36# end_server at Base 5.5.35
+#MISSING: 5.5.36# error_handler_hook at Base 5.5.35
+#MISSING: 5.5.36# escape_quotes_for_mysql at Base 5.5.35
+#MISSING: 5.5.36# escape_string_for_mysql at Base 5.5.35
+#MISSING: 5.5.36# fastmutex_global_init at Base 5.5.35
+#MISSING: 5.5.36# fatal_error_handler_hook at Base 5.5.35
+#MISSING: 5.5.36# find_set_from_flags at Base 5.5.35
+#MISSING: 5.5.36# find_type at Base 5.5.35
+#MISSING: 5.5.36# find_type_or_exit at Base 5.5.35
+#MISSING: 5.5.36# find_type_with_warning at Base 5.5.35
+#MISSING: 5.5.36# find_typeset at Base 5.5.35
+#MISSING: 5.5.36# finish_client_errs at Base 5.5.35
+#MISSING: 5.5.36# flush_one_result at Base 5.5.35
+#MISSING: 5.5.36# fn_ext at Base 5.5.35
+#MISSING: 5.5.36# fn_format at Base 5.5.35
+#MISSING: 5.5.36# free_charsets at Base 5.5.35
+#MISSING: 5.5.36# free_defaults at Base 5.5.35
  free_defaults at libmariadbclient_16 5.5.36
  free_defaults at libmariadbclient_18 5.5.36
- free_root at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# free_old_query at Base 5.5.35
+#MISSING: 5.5.36# free_root at Base 5.5.35
+ free_root at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# free_rows at Base 5.5.35
+#MISSING: 5.5.36# free_vio_ssl_acceptor_fd at Base 5.5.35
+#MISSING: 5.5.36# freeze_size at Base 5.5.35
+#MISSING: 5.5.36# get_charset at Base 5.5.35
  get_charset at libmariadbclient_16 5.5.36
  get_charset at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# get_charset_by_csname at Base 5.5.35
  get_charset_by_csname at libmariadbclient_16 5.5.36
  get_charset_by_csname at libmariadbclient_18 5.5.36
- get_dynamic at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# get_charset_by_name at Base 5.5.35
+#MISSING: 5.5.36# get_charset_name at Base 5.5.35
+#MISSING: 5.5.36# get_charset_number at Base 5.5.35
+#MISSING: 5.5.36# get_charsets_dir at Base 5.5.35
+#MISSING: 5.5.36# get_client_errmsgs at Base 5.5.35
+#MISSING: 5.5.36# get_collation_number at Base 5.5.35
+#MISSING: 5.5.36# get_defaults_options at Base 5.5.35
+#MISSING: 5.5.36# get_dynamic at Base 5.5.35
+ get_dynamic at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# get_global_errmsgs at Base 5.5.35
+#MISSING: 5.5.36# get_index_dynamic at Base 5.5.35
+#MISSING: 5.5.36# get_salt_from_password at Base 5.5.35
+#MISSING: 5.5.36# get_salt_from_password_323 at Base 5.5.35
+#MISSING: 5.5.36# get_tty_password at Base 5.5.35
  get_tty_password at libmariadbclient_16 5.5.36
  get_tty_password at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# get_tty_password_buff at Base 5.5.35
+#MISSING: 5.5.36# get_type at Base 5.5.35
+#MISSING: 5.5.36# getopt_compare_strings at Base 5.5.35
+#MISSING: 5.5.36# getopt_double2ulonglong at Base 5.5.35
+#MISSING: 5.5.36# getopt_double_limit_value at Base 5.5.35
+#MISSING: 5.5.36# getopt_ll_limit_value at Base 5.5.35
+#MISSING: 5.5.36# getopt_ull_limit_value at Base 5.5.35
+#MISSING: 5.5.36# getopt_ulonglong2double at Base 5.5.35
+#MISSING: 5.5.36# globerrs at Base 5.5.35
+#MISSING: 5.5.36# handle_local_infile at Base 5.5.35
+#MISSING: 5.5.36# handle_options at Base 5.5.35
  handle_options at libmariadbclient_16 5.5.36
  handle_options at libmariadbclient_18 5.5.36
- init_dynamic_array2 at libmariadbclient_18 5.5.37
- init_dynamic_string at libmariadbclient_18 5.5.37
- int2str at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# has_path at Base 5.5.35
+#MISSING: 5.5.36# hash_password at Base 5.5.35
+#MISSING: 5.5.36# home_dir at Base 5.5.35
+#MISSING: 5.5.36# home_dir_buff at Base 5.5.35
+#MISSING: 5.5.36# init_alloc_root at Base 5.5.35
+#MISSING: 5.5.36# init_client_errs at Base 5.5.35
+#MISSING: 5.5.36# init_compiled_charsets at Base 5.5.35
+#MISSING: 5.5.36# init_dynamic_array2 at Base 5.5.35
+ init_dynamic_array2 at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# init_dynamic_array at Base 5.5.35
+#MISSING: 5.5.36# init_dynamic_string at Base 5.5.35
+ init_dynamic_string at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# init_glob_errs at Base 5.5.35
+#MISSING: 5.5.36# insert_dynamic at Base 5.5.35
+#MISSING: 5.5.36# int10_to_str at Base 5.5.35
+#MISSING: 5.5.36# int2str at Base 5.5.35
+ int2str at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# intern_filename at Base 5.5.35
+#MISSING: 5.5.36# internal_str2dec at Base 5.5.35
+#MISSING: 5.5.36# is_prefix at Base 5.5.35
  is_prefix at libmariadbclient_16 5.5.36
  is_prefix at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# key_BITMAP_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_COND_alarm at Base 5.5.35
+#MISSING: 5.5.36# key_IO_CACHE_SHARE_cond at Base 5.5.35
+#MISSING: 5.5.36# key_IO_CACHE_SHARE_cond_writer at Base 5.5.35
+#MISSING: 5.5.36# key_IO_CACHE_SHARE_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_IO_CACHE_append_buffer_lock at Base 5.5.35
+#MISSING: 5.5.36# key_KEY_CACHE_cache_lock at Base 5.5.35
+#MISSING: 5.5.36# key_LOCK_alarm at Base 5.5.35
+#MISSING: 5.5.36# key_LOCK_uuid_generator at Base 5.5.35
+#MISSING: 5.5.36# key_SAFEHASH_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_THR_COND_threads at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_charset at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_heap at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_isam at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_lock at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_malloc at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_myisam at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_myisam_mmap at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_net at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_open at Base 5.5.35
+#MISSING: 5.5.36# key_THR_LOCK_threads at Base 5.5.35
+#MISSING: 5.5.36# key_TMPDIR_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_WT_RESOURCE_cond at Base 5.5.35
+#MISSING: 5.5.36# key_file_charset at Base 5.5.35
+#MISSING: 5.5.36# key_file_cnf at Base 5.5.35
+#MISSING: 5.5.36# key_file_proc_meminfo at Base 5.5.35
+#MISSING: 5.5.36# key_my_thread_var_mutex at Base 5.5.35
+#MISSING: 5.5.36# key_my_thread_var_suspend at Base 5.5.35
  libmariadbclient_16 at libmariadbclient_16 5.5.36
  libmariadbclient_18 at libmariadbclient_18 5.5.36
- list_add at libmariadbclient_18 5.5.37
- list_delete at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# libmysql_api_funcs at Base 5.5.35
+#MISSING: 5.5.36# list_add at Base 5.5.35
+ list_add at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# list_cons at Base 5.5.35
+#MISSING: 5.5.36# list_delete at Base 5.5.35
+ list_delete at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# list_free at Base 5.5.35
+#MISSING: 5.5.36# list_length at Base 5.5.35
+#MISSING: 5.5.36# list_reverse at Base 5.5.35
+#MISSING: 5.5.36# list_walk at Base 5.5.35
+#MISSING: 5.5.36# llstr at Base 5.5.35
+#MISSING: 5.5.36# load_defaults at Base 5.5.35
  load_defaults at libmariadbclient_16 5.5.36
  load_defaults at libmariadbclient_18 5.5.36
- make_scrambled_password at libmariadbclient_18 5.5.37
- make_scrambled_password_323 at libmariadbclient_18 5.5.37
- my_charset_bin at libmariadbclient_18 5.5.38
- my_charset_latin1 at libmariadbclient_18 5.5.38
- my_charset_utf8_general_ci at libmariadbclient_18 5.5.38
- my_end at libmariadbclient_18 5.5.37
- my_free at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# log_10_int at Base 5.5.35
+#MISSING: 5.5.36# longlong2decimal at Base 5.5.35
+#MISSING: 5.5.36# make_password_from_salt at Base 5.5.35
+#MISSING: 5.5.36# make_password_from_salt_323 at Base 5.5.35
+#MISSING: 5.5.36# make_scrambled_password at Base 5.5.35
+ make_scrambled_password at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# make_scrambled_password_323 at Base 5.5.35
+ make_scrambled_password_323 at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# make_type at Base 5.5.35
+#MISSING: 5.5.36# mariadb_connection at Base 5.5.35
+#MISSING: 5.5.36# max_allowed_packet at Base 5.5.35
+#MISSING: 5.5.36# max_decimal at Base 5.5.35
+#MISSING: 5.5.36# memdup_root at Base 5.5.35
+#MISSING: 5.5.36# mpvio_info at Base 5.5.35
+#MISSING: 5.5.36# multi_alloc_root at Base 5.5.35
+#MISSING: 5.5.36# my_TIME_to_str at Base 5.5.35
+#MISSING: 5.5.36# my_abort_hook at Base 5.5.35
+#MISSING: 5.5.36# my_assert_on_error at Base 5.5.35
+#MISSING: 5.5.36# my_atof at Base 5.5.35
+#MISSING: 5.5.36# my_az_allocator at Base 5.5.35
+#MISSING: 5.5.36# my_az_free at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_mb at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_mb_varlen at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_str_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_str_mb at Base 5.5.35
+#MISSING: 5.5.36# my_casedn_ujis at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_mb at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_mb_varlen at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_str_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_str_mb at Base 5.5.35
+#MISSING: 5.5.36# my_caseup_ujis at Base 5.5.35
+#MISSING: 5.5.36# my_charpos_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_charpos_mb at Base 5.5.35
+#MISSING: 5.5.36# my_charset_8bit_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_big5_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_big5_chinese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_bin at Base 5.5.35
+ my_charset_bin at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_charset_cp1250_czech_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_cp932_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_cp932_japanese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_eucjpms_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_eucjpms_japanese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_euckr_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_euckr_korean_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_filename at Base 5.5.35
+#MISSING: 5.5.36# my_charset_gb2312_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_gb2312_chinese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_gbk_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_gbk_chinese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_is_8bit_pure_ascii at Base 5.5.35
+#MISSING: 5.5.36# my_charset_is_ascii_based at Base 5.5.35
+#MISSING: 5.5.36# my_charset_is_ascii_compatible at Base 5.5.35
+#MISSING: 5.5.36# my_charset_latin1 at Base 5.5.35
+ my_charset_latin1 at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_charset_latin1_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_latin1_german2_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_latin2_czech_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_repertoire at Base 5.5.35
+#MISSING: 5.5.36# my_charset_same at Base 5.5.35
+#MISSING: 5.5.36# my_charset_sjis_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_sjis_japanese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_tis620_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_tis620_thai_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_croatian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_czech_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_danish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_esperanto_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_estonian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_general_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_general_mysql500_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_hungarian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_icelandic_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_latvian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_lithuanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_persian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_polish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_roman_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_romanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_sinhala_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_slovak_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_slovenian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_spanish2_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_spanish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_swedish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_turkish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ucs2_unicode_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ujis_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_ujis_japanese_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_croatian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_czech_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_danish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_esperanto_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_estonian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_general_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_hungarian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_icelandic_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_latvian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_lithuanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_persian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_polish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_roman_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_romanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_sinhala_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_slovak_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_slovenian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_spanish2_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_spanish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_swedish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_turkish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf16_unicode_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_croatian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_czech_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_danish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_esperanto_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_estonian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_general_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_hungarian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_icelandic_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_latvian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_lithuanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_persian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_polish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_roman_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_romanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_sinhala_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_slovak_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_slovenian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_spanish2_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_spanish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_swedish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_turkish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf32_unicode_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_croatian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_czech_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_danish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_esperanto_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_estonian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_general_ci at Base 5.5.35
+ my_charset_utf8_general_ci at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_charset_utf8_general_mysql500_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_hungarian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_icelandic_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_latvian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_lithuanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_persian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_polish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_roman_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_romanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_sinhala_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_slovak_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_slovenian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_spanish2_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_spanish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_swedish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_turkish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8_unicode_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_bin at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_croatian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_czech_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_danish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_esperanto_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_estonian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_general_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_handler at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_hungarian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_icelandic_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_latvian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_lithuanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_persian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_polish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_roman_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_romanian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_sinhala_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_slovak_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_slovenian_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_spanish2_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_spanish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_swedish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_turkish_uca_ci at Base 5.5.35
+#MISSING: 5.5.36# my_charset_utf8mb4_unicode_ci at Base 5.5.35
+#MISSING: 5.5.36# my_cleanup_options at Base 5.5.35
+#MISSING: 5.5.36# my_close at Base 5.5.35
+#MISSING: 5.5.36# my_collation_8bit_bin_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_8bit_simple_ci_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_any_uca_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_mb_bin_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_ucs2_uca_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_utf16_uca_handler at Base 5.5.35
+#MISSING: 5.5.36# my_collation_utf32_uca_handler at Base 5.5.35
+#MISSING: 5.5.36# my_compress at Base 5.5.35
+#MISSING: 5.5.36# my_compress_alloc at Base 5.5.35
+#MISSING: 5.5.36# my_compress_buffer at Base 5.5.35
+#MISSING: 5.5.36# my_connect at Base 5.5.35
+#MISSING: 5.5.36# my_connect_async at Base 5.5.35
+#MISSING: 5.5.36# my_context_continue at Base 5.5.35
+#MISSING: 5.5.36# my_context_destroy at Base 5.5.35
+#MISSING: 5.5.36# my_context_init at Base 5.5.35
+#MISSING: 5.5.36# my_context_install_suspend_resume_hook at Base 5.5.35
+#MISSING: 5.5.36# my_context_spawn at Base 5.5.35
+#MISSING: 5.5.36# my_context_yield at Base 5.5.35
+#MISSING: 5.5.36# my_cs_can_be_contraction_head at Base 5.5.35
+#MISSING: 5.5.36# my_cs_can_be_contraction_tail at Base 5.5.35
+#MISSING: 5.5.36# my_cs_contraction2_weight at Base 5.5.35
+#MISSING: 5.5.36# my_cs_have_contractions at Base 5.5.35
+#MISSING: 5.5.36# my_date_to_str at Base 5.5.35
+#MISSING: 5.5.36# my_datetime_to_str at Base 5.5.35
+#MISSING: 5.5.36# my_default_record_cache_size at Base 5.5.35
+#MISSING: 5.5.36# my_defaults_extra_file at Base 5.5.35
+#MISSING: 5.5.36# my_defaults_file at Base 5.5.35
+#MISSING: 5.5.36# my_defaults_group_suffix at Base 5.5.35
+#MISSING: 5.5.36# my_dir at Base 5.5.35
+#MISSING: 5.5.36# my_dirend at Base 5.5.35
+#MISSING: 5.5.36# my_disable_async_io at Base 5.5.35
+#MISSING: 5.5.36# my_disable_flush_key_blocks at Base 5.5.35
+#MISSING: 5.5.36# my_disable_locking at Base 5.5.35
+#MISSING: 5.5.36# my_disable_symlinks at Base 5.5.35
+#MISSING: 5.5.36# my_disable_sync at Base 5.5.35
+#MISSING: 5.5.36# my_dont_interrupt at Base 5.5.35
+#MISSING: 5.5.36# my_end at Base 5.5.35
+ my_end at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_error at Base 5.5.35
+#MISSING: 5.5.36# my_error_register at Base 5.5.35
+#MISSING: 5.5.36# my_error_unregister at Base 5.5.35
+#MISSING: 5.5.36# my_error_unregister_all at Base 5.5.35
+#MISSING: 5.5.36# my_errorcheck_mutexattr at Base 5.5.35
+#MISSING: 5.5.36# my_fast_mutexattr at Base 5.5.35
+#MISSING: 5.5.36# my_fclose at Base 5.5.35
+#MISSING: 5.5.36# my_fcvt at Base 5.5.35
+#MISSING: 5.5.36# my_fdopen at Base 5.5.35
+#MISSING: 5.5.36# my_file_info at Base 5.5.35
+#MISSING: 5.5.36# my_file_info_default at Base 5.5.35
+#MISSING: 5.5.36# my_file_limit at Base 5.5.35
+#MISSING: 5.5.36# my_file_opened at Base 5.5.35
+#MISSING: 5.5.36# my_file_total_opened at Base 5.5.35
+#MISSING: 5.5.36# my_filename at Base 5.5.35
+#MISSING: 5.5.36# my_fileno at Base 5.5.35
+#MISSING: 5.5.36# my_fill_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_fopen at Base 5.5.35
+#MISSING: 5.5.36# my_fprintf at Base 5.5.35
+#MISSING: 5.5.36# my_fread at Base 5.5.35
+#MISSING: 5.5.36# my_free at Base 5.5.35
+ my_free at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_freopen at Base 5.5.35
+#MISSING: 5.5.36# my_fseek at Base 5.5.35
+#MISSING: 5.5.36# my_fstat at Base 5.5.35
+#MISSING: 5.5.36# my_ftell at Base 5.5.35
+#MISSING: 5.5.36# my_fwrite at Base 5.5.35
+#MISSING: 5.5.36# my_gcvt at Base 5.5.35
+#MISSING: 5.5.36# my_getcputime at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_error_reporter at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_is_args_separator at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_print_errors at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_register_get_addr at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_skip_unknown at Base 5.5.35
+#MISSING: 5.5.36# my_getopt_use_args_separator at Base 5.5.35
+#MISSING: 5.5.36# my_getwd at Base 5.5.35
+#MISSING: 5.5.36# my_global_flags at Base 5.5.35
+#MISSING: 5.5.36# my_hash_sort_8bit_bin at Base 5.5.35
+#MISSING: 5.5.36# my_hash_sort_bin at Base 5.5.35
+#MISSING: 5.5.36# my_hash_sort_latin1_de at Base 5.5.35
+#MISSING: 5.5.36# my_hash_sort_mb_bin at Base 5.5.35
+#MISSING: 5.5.36# my_hash_sort_simple at Base 5.5.35
+#MISSING: 5.5.36# my_have_got_alarm at Base 5.5.35
+#MISSING: 5.5.36# my_hrtime at Base 5.5.35
+#MISSING: 5.5.36# my_init at Base 5.5.35
  my_init at libmariadbclient_16 5.5.36
  my_init at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# my_init_done at Base 5.5.35
+#MISSING: 5.5.36# my_init_mysys_psi_keys at Base 5.5.35
+#MISSING: 5.5.36# my_init_time at Base 5.5.35
+#MISSING: 5.5.36# my_instr_mb at Base 5.5.35
+#MISSING: 5.5.36# my_instr_simple at Base 5.5.35
+#MISSING: 5.5.36# my_interval_timer at Base 5.5.35
+#MISSING: 5.5.36# my_is_symlink at Base 5.5.35
+#MISSING: 5.5.36# my_large_page_size at Base 5.5.35
+#MISSING: 5.5.36# my_lengthsp_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_lengthsp_binary at Base 5.5.35
+#MISSING: 5.5.36# my_like_range_generic at Base 5.5.35
+#MISSING: 5.5.36# my_like_range_mb at Base 5.5.35
+#MISSING: 5.5.36# my_like_range_simple at Base 5.5.35
+#MISSING: 5.5.36# my_load_defaults at Base 5.5.35
+#MISSING: 5.5.36# my_load_path at Base 5.5.35
+#MISSING: 5.5.36# my_long10_to_str_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_longlong10_to_str_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_make_scrambled_password at Base 5.5.35
  my_make_scrambled_password at libmariadbclient_16 5.5.36
  my_make_scrambled_password at libmariadbclient_18 5.5.36
- my_malloc at libmariadbclient_18 5.5.37
- my_memdup at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# my_make_scrambled_password_323 at Base 5.5.35
+#MISSING: 5.5.36# my_malloc at Base 5.5.35
+ my_malloc at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_mb_ctype_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_mb_ctype_mb at Base 5.5.35
+#MISSING: 5.5.36# my_mb_wc_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_mbcharlen_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_memdup at Base 5.5.35
+ my_memdup at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_message at Base 5.5.35
+#MISSING: 5.5.36# my_message_stderr at Base 5.5.35
+#MISSING: 5.5.36# my_multi_malloc at Base 5.5.35
+#MISSING: 5.5.36# my_mutex_end at Base 5.5.35
+#MISSING: 5.5.36# my_mutex_init at Base 5.5.35
+#MISSING: 5.5.36# my_net_init at Base 5.5.35
+#MISSING: 5.5.36# my_net_local_init at Base 5.5.35
+#MISSING: 5.5.36# my_net_read at Base 5.5.35
+#MISSING: 5.5.36# my_net_set_read_timeout at Base 5.5.35
+#MISSING: 5.5.36# my_net_set_write_timeout at Base 5.5.35
+#MISSING: 5.5.36# my_net_write at Base 5.5.35
+#MISSING: 5.5.36# my_numcells_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_numcells_mb at Base 5.5.35
+#MISSING: 5.5.36# my_numchars_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_numchars_mb at Base 5.5.35
+#MISSING: 5.5.36# my_once_alloc at Base 5.5.35
+#MISSING: 5.5.36# my_once_extra at Base 5.5.35
+#MISSING: 5.5.36# my_once_free at Base 5.5.35
+#MISSING: 5.5.36# my_once_memdup at Base 5.5.35
+#MISSING: 5.5.36# my_once_root_block at Base 5.5.35
+#MISSING: 5.5.36# my_once_strdup at Base 5.5.35
+#MISSING: 5.5.36# my_open at Base 5.5.35
+#MISSING: 5.5.36# my_parse_charset_xml at Base 5.5.35
+#MISSING: 5.5.36# my_pipe_sig_handler at Base 5.5.35
+#MISSING: 5.5.36# my_poll_read_async at Base 5.5.35
+#MISSING: 5.5.36# my_print_default_files at Base 5.5.35
+#MISSING: 5.5.36# my_print_help at Base 5.5.35
  my_print_help at libmariadbclient_16 5.5.36
  my_print_help at libmariadbclient_18 5.5.36
- my_progname at libmariadbclient_18 5.5.38
- my_realloc at libmariadbclient_18 5.5.37
- my_strdup at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# my_print_variables at Base 5.5.35
+#MISSING: 5.5.36# my_printf_error at Base 5.5.35
+#MISSING: 5.5.36# my_printv_error at Base 5.5.35
+#MISSING: 5.5.36# my_progname at Base 5.5.35
+ my_progname at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_progname_short at Base 5.5.35
+#MISSING: 5.5.36# my_propagate_complex at Base 5.5.35
+#MISSING: 5.5.36# my_propagate_simple at Base 5.5.35
+#MISSING: 5.5.36# my_pthread_create_detached at Base 5.5.35
+#MISSING: 5.5.36# my_pthread_fastmutex_init at Base 5.5.35
+#MISSING: 5.5.36# my_pthread_fastmutex_lock at Base 5.5.35
+#MISSING: 5.5.36# my_qsort at Base 5.5.35
+#MISSING: 5.5.36# my_read at Base 5.5.35
+#MISSING: 5.5.36# my_readlink at Base 5.5.35
+#MISSING: 5.5.36# my_realloc at Base 5.5.35
+ my_realloc at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_realpath at Base 5.5.35
+#MISSING: 5.5.36# my_recv_async at Base 5.5.35
+#MISSING: 5.5.36# my_register_filename at Base 5.5.35
+#MISSING: 5.5.36# my_rnd at Base 5.5.35
+#MISSING: 5.5.36# my_rnd_init at Base 5.5.35
+#MISSING: 5.5.36# my_scan_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_search_option_files at Base 5.5.35
+#MISSING: 5.5.36# my_send_async at Base 5.5.35
+#MISSING: 5.5.36# my_setwd at Base 5.5.35
+#MISSING: 5.5.36# my_snprintf at Base 5.5.35
+#MISSING: 5.5.36# my_snprintf_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_ssl_read_async at Base 5.5.35
+#MISSING: 5.5.36# my_ssl_write_async at Base 5.5.35
+#MISSING: 5.5.36# my_stat at Base 5.5.35
+#MISSING: 5.5.36# my_str_free at Base 5.5.35
+#MISSING: 5.5.36# my_str_malloc at Base 5.5.35
+#MISSING: 5.5.36# my_strcasecmp_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strcasecmp_mb at Base 5.5.35
+#MISSING: 5.5.36# my_strcasecmp_mb_bin at Base 5.5.35
+#MISSING: 5.5.36# my_strdup at Base 5.5.35
+ my_strdup at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# my_stream_opened at Base 5.5.35
+#MISSING: 5.5.36# my_string_repertoire at Base 5.5.35
+#MISSING: 5.5.36# my_string_stack_guard at Base 5.5.35
+#MISSING: 5.5.36# my_strndup at Base 5.5.35
+#MISSING: 5.5.36# my_strnncoll_gbk at Base 5.5.35
+#MISSING: 5.5.36# my_strnncoll_gbk_internal at Base 5.5.35
+#MISSING: 5.5.36# my_strnncoll_mb_bin at Base 5.5.35
+#MISSING: 5.5.36# my_strnncoll_simple at Base 5.5.35
+#MISSING: 5.5.36# my_strnncollsp_mb_bin at Base 5.5.35
+#MISSING: 5.5.36# my_strnncollsp_simple at Base 5.5.35
+#MISSING: 5.5.36# my_strntod_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strntol_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strntoll_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strntoul_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strntoull10rnd_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strntoull_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_strnxfrm_simple at Base 5.5.35
+#MISSING: 5.5.36# my_strnxfrm_unicode at Base 5.5.35
+#MISSING: 5.5.36# my_strnxfrm_unicode_full_bin at Base 5.5.35
+#MISSING: 5.5.36# my_strnxfrmlen_simple at Base 5.5.35
+#MISSING: 5.5.36# my_strnxfrmlen_unicode_full_bin at Base 5.5.35
+#MISSING: 5.5.36# my_strtod at Base 5.5.35
+#MISSING: 5.5.36# my_strtoll10 at Base 5.5.35
+#MISSING: 5.5.36# my_strtoll10_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_symlink at Base 5.5.35
+#MISSING: 5.5.36# my_sync at Base 5.5.35
+#MISSING: 5.5.36# my_sync_count at Base 5.5.35
+#MISSING: 5.5.36# my_sync_dir at Base 5.5.35
+#MISSING: 5.5.36# my_sync_dir_by_file at Base 5.5.35
+#MISSING: 5.5.36# my_system_gmt_sec at Base 5.5.35
+#MISSING: 5.5.36# my_thread_dbug_id at Base 5.5.35
+#MISSING: 5.5.36# my_thread_destroy_common_mutex at Base 5.5.35
+#MISSING: 5.5.36# my_thread_destroy_internal_mutex at Base 5.5.35
+#MISSING: 5.5.36# my_thread_end at Base 5.5.35
+#MISSING: 5.5.36# my_thread_end_wait_time at Base 5.5.35
+#MISSING: 5.5.36# my_thread_global_end at Base 5.5.35
+#MISSING: 5.5.36# my_thread_global_init at Base 5.5.35
+#MISSING: 5.5.36# my_thread_global_reinit at Base 5.5.35
+#MISSING: 5.5.36# my_thread_init at Base 5.5.35
+#MISSING: 5.5.36# my_thread_name at Base 5.5.35
+#MISSING: 5.5.36# my_thread_stack_size at Base 5.5.35
+#MISSING: 5.5.36# my_thread_var_mutex_in_use at Base 5.5.35
+#MISSING: 5.5.36# my_time_init at Base 5.5.35
+#MISSING: 5.5.36# my_time_to_str at Base 5.5.35
+#MISSING: 5.5.36# my_time_to_wait_for_lock at Base 5.5.35
+#MISSING: 5.5.36# my_tmp_file_created at Base 5.5.35
+#MISSING: 5.5.36# my_umask at Base 5.5.35
+#MISSING: 5.5.36# my_umask_dir at Base 5.5.35
+#MISSING: 5.5.36# my_uncompress at Base 5.5.35
+#MISSING: 5.5.36# my_uni_ctype at Base 5.5.35
+#MISSING: 5.5.36# my_unicase_default at Base 5.5.35
+#MISSING: 5.5.36# my_unicase_mysql500 at Base 5.5.35
+#MISSING: 5.5.36# my_unicase_turkish at Base 5.5.35
+#MISSING: 5.5.36# my_use_large_pages at Base 5.5.35
+#MISSING: 5.5.36# my_use_symdir at Base 5.5.35
+#MISSING: 5.5.36# my_vfprintf at Base 5.5.35
+#MISSING: 5.5.36# my_vsnprintf at Base 5.5.35
+#MISSING: 5.5.36# my_vsnprintf_ex at Base 5.5.35
+#MISSING: 5.5.36# my_wc_mb_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_well_formed_len_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_well_formed_len_mb at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_8bit at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_bin at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_mb at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_mb_bin at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_uca at Base 5.5.35
+#MISSING: 5.5.36# my_wildcmp_unicode at Base 5.5.35
+#MISSING: 5.5.36# my_xml_error_lineno at Base 5.5.35
+#MISSING: 5.5.36# my_xml_error_pos at Base 5.5.35
+#MISSING: 5.5.36# my_xml_error_string at Base 5.5.35
+#MISSING: 5.5.36# my_xml_parse at Base 5.5.35
+#MISSING: 5.5.36# my_xml_parser_create at Base 5.5.35
+#MISSING: 5.5.36# my_xml_parser_free at Base 5.5.35
+#MISSING: 5.5.36# my_xml_set_enter_handler at Base 5.5.35
+#MISSING: 5.5.36# my_xml_set_leave_handler at Base 5.5.35
+#MISSING: 5.5.36# my_xml_set_user_data at Base 5.5.35
+#MISSING: 5.5.36# my_xml_set_value_handler at Base 5.5.35
+#MISSING: 5.5.36# myodbc_remove_escape at Base 5.5.35
  myodbc_remove_escape at libmariadbclient_16 5.5.36
  myodbc_remove_escape at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_affected_rows at Base 5.5.35
  mysql_affected_rows at libmariadbclient_16 5.5.36
  mysql_affected_rows at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_autocommit at Base 5.5.35
  mysql_autocommit at libmariadbclient_16 5.5.36
  mysql_autocommit at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_autocommit_cont at Base 5.5.35
  mysql_autocommit_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_autocommit_start at Base 5.5.35
  mysql_autocommit_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_change_user at Base 5.5.35
  mysql_change_user at libmariadbclient_16 5.5.36
  mysql_change_user at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_change_user_cont at Base 5.5.35
  mysql_change_user_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_change_user_start at Base 5.5.35
  mysql_change_user_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_character_set_name at Base 5.5.35
  mysql_character_set_name at libmariadbclient_16 5.5.36
  mysql_character_set_name at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_client_builtins at Base 5.5.35
  mysql_client_errors at libmariadbclient_16 5.5.36
  mysql_client_errors at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_client_find_plugin at Base 5.5.35
  mysql_client_find_plugin at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_client_plugin_deinit at Base 5.5.35
+#MISSING: 5.5.36# mysql_client_plugin_init at Base 5.5.35
+#MISSING: 5.5.36# mysql_client_register_plugin at Base 5.5.35
  mysql_client_register_plugin at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_close at Base 5.5.35
  mysql_close at libmariadbclient_16 5.5.36
  mysql_close at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_close_cont at Base 5.5.35
  mysql_close_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_close_slow_part at Base 5.5.35
+#MISSING: 5.5.36# mysql_close_slow_part_cont at Base 5.5.35
+#MISSING: 5.5.36# mysql_close_slow_part_start at Base 5.5.35
+#MISSING: 5.5.36# mysql_close_start at Base 5.5.35
  mysql_close_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_commit at Base 5.5.35
  mysql_commit at libmariadbclient_16 5.5.36
  mysql_commit at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_commit_cont at Base 5.5.35
  mysql_commit_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_commit_start at Base 5.5.35
  mysql_commit_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_data_home at Base 5.5.35
+#MISSING: 5.5.36# mysql_data_seek at Base 5.5.35
  mysql_data_seek at libmariadbclient_16 5.5.36
  mysql_data_seek at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_debug at Base 5.5.35
  mysql_debug at libmariadbclient_16 5.5.36
  mysql_debug at libmariadbclient_18 5.5.36
  mysql_default_charset_info at libmariadbclient_16 5.5.36
  mysql_default_charset_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_detach_stmt_list at Base 5.5.35
+#MISSING: 5.5.36# mysql_dump_debug_info at Base 5.5.35
  mysql_dump_debug_info at libmariadbclient_16 5.5.36
  mysql_dump_debug_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_dump_debug_info_cont at Base 5.5.35
  mysql_dump_debug_info_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_dump_debug_info_start at Base 5.5.35
  mysql_dump_debug_info_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_embedded at Base 5.5.35
  mysql_embedded at libmariadbclient_16 5.5.36
  mysql_embedded at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_eof at Base 5.5.35
  mysql_eof at libmariadbclient_16 5.5.36
  mysql_eof at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_errno at Base 5.5.35
  mysql_errno at libmariadbclient_16 5.5.36
  mysql_errno at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_error at Base 5.5.35
  mysql_error at libmariadbclient_16 5.5.36
  mysql_error at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_escape_string at Base 5.5.35
  mysql_escape_string at libmariadbclient_16 5.5.36
  mysql_escape_string at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_field at Base 5.5.35
  mysql_fetch_field at libmariadbclient_16 5.5.36
  mysql_fetch_field at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_field_direct at Base 5.5.35
  mysql_fetch_field_direct at libmariadbclient_16 5.5.36
  mysql_fetch_field_direct at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_fields at Base 5.5.35
  mysql_fetch_fields at libmariadbclient_16 5.5.36
  mysql_fetch_fields at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_lengths at Base 5.5.35
  mysql_fetch_lengths at libmariadbclient_16 5.5.36
  mysql_fetch_lengths at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_row at Base 5.5.35
  mysql_fetch_row at libmariadbclient_16 5.5.36
  mysql_fetch_row at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_row_cont at Base 5.5.35
  mysql_fetch_row_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_fetch_row_start at Base 5.5.35
  mysql_fetch_row_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_field_count at Base 5.5.35
  mysql_field_count at libmariadbclient_16 5.5.36
  mysql_field_count at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_field_seek at Base 5.5.35
  mysql_field_seek at libmariadbclient_16 5.5.36
  mysql_field_seek at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_field_tell at Base 5.5.35
  mysql_field_tell at libmariadbclient_16 5.5.36
  mysql_field_tell at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_free_result at Base 5.5.35
  mysql_free_result at libmariadbclient_16 5.5.36
  mysql_free_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_free_result_cont at Base 5.5.35
  mysql_free_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_free_result_start at Base 5.5.35
  mysql_free_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_character_set_info at Base 5.5.35
  mysql_get_character_set_info at libmariadbclient_16 5.5.36
  mysql_get_character_set_info at libmariadbclient_18 5.5.36
  mysql_get_charset at libmariadbclient_16 5.5.36
  mysql_get_charset at libmariadbclient_18 5.5.36
  mysql_get_charset_by_csname at libmariadbclient_16 5.5.36
  mysql_get_charset_by_csname at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_client_info at Base 5.5.35
  mysql_get_client_info at libmariadbclient_16 5.5.36
  mysql_get_client_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_client_version at Base 5.5.35
  mysql_get_client_version at libmariadbclient_16 5.5.36
  mysql_get_client_version at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_host_info at Base 5.5.35
  mysql_get_host_info at libmariadbclient_16 5.5.36
  mysql_get_host_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_parameters at Base 5.5.35
  mysql_get_parameters at libmariadbclient_16 5.5.36
  mysql_get_parameters at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_proto_info at Base 5.5.35
  mysql_get_proto_info at libmariadbclient_16 5.5.36
  mysql_get_proto_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_server_info at Base 5.5.35
  mysql_get_server_info at libmariadbclient_16 5.5.36
  mysql_get_server_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_server_name at Base 5.5.35
+#MISSING: 5.5.36# mysql_get_server_version at Base 5.5.35
  mysql_get_server_version at libmariadbclient_16 5.5.36
  mysql_get_server_version at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_socket at Base 5.5.35
  mysql_get_socket at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_ssl_cipher at Base 5.5.35
  mysql_get_ssl_cipher at libmariadbclient_16 5.5.36
  mysql_get_ssl_cipher at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_timeout_value at Base 5.5.35
  mysql_get_timeout_value at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_get_timeout_value_ms at Base 5.5.35
  mysql_get_timeout_value_ms at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_hex_string at Base 5.5.35
  mysql_hex_string at libmariadbclient_16 5.5.36
  mysql_hex_string at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_info at Base 5.5.35
  mysql_info at libmariadbclient_16 5.5.36
  mysql_info at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_init at Base 5.5.35
  mysql_init at libmariadbclient_16 5.5.36
  mysql_init at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_init_character_set at Base 5.5.35
+#MISSING: 5.5.36# mysql_insert_id at Base 5.5.35
  mysql_insert_id at libmariadbclient_16 5.5.36
  mysql_insert_id at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_kill at Base 5.5.35
  mysql_kill at libmariadbclient_16 5.5.36
  mysql_kill at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_kill_cont at Base 5.5.35
  mysql_kill_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_kill_start at Base 5.5.35
  mysql_kill_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_dbs at Base 5.5.35
  mysql_list_dbs at libmariadbclient_16 5.5.36
  mysql_list_dbs at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_dbs_cont at Base 5.5.35
  mysql_list_dbs_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_dbs_start at Base 5.5.35
  mysql_list_dbs_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_fields at Base 5.5.35
  mysql_list_fields at libmariadbclient_16 5.5.36
  mysql_list_fields at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_fields_cont at Base 5.5.35
  mysql_list_fields_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_fields_start at Base 5.5.35
  mysql_list_fields_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_processes at Base 5.5.35
  mysql_list_processes at libmariadbclient_16 5.5.36
  mysql_list_processes at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_processes_cont at Base 5.5.35
  mysql_list_processes_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_processes_start at Base 5.5.35
  mysql_list_processes_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_tables at Base 5.5.35
  mysql_list_tables at libmariadbclient_16 5.5.36
  mysql_list_tables at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_tables_cont at Base 5.5.35
  mysql_list_tables_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_list_tables_start at Base 5.5.35
  mysql_list_tables_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_load_plugin at Base 5.5.35
  mysql_load_plugin at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_load_plugin_v at Base 5.5.35
  mysql_load_plugin_v at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_more_results at Base 5.5.35
  mysql_more_results at libmariadbclient_16 5.5.36
  mysql_more_results at libmariadbclient_18 5.5.36
  mysql_net_realloc at libmariadbclient_16 5.5.36
  mysql_net_realloc at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_next_result at Base 5.5.35
  mysql_next_result at libmariadbclient_16 5.5.36
  mysql_next_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_next_result_cont at Base 5.5.35
  mysql_next_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_next_result_start at Base 5.5.35
  mysql_next_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_num_fields at Base 5.5.35
  mysql_num_fields at libmariadbclient_16 5.5.36
  mysql_num_fields at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_num_rows at Base 5.5.35
  mysql_num_rows at libmariadbclient_16 5.5.36
  mysql_num_rows at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_options at Base 5.5.35
  mysql_options at libmariadbclient_16 5.5.36
  mysql_options at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_ping at Base 5.5.35
  mysql_ping at libmariadbclient_16 5.5.36
  mysql_ping at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_ping_cont at Base 5.5.35
  mysql_ping_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_ping_start at Base 5.5.35
  mysql_ping_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_plugin_options at Base 5.5.35
  mysql_plugin_options at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_port at Base 5.5.35
+#MISSING: 5.5.36# mysql_query at Base 5.5.35
  mysql_query at libmariadbclient_16 5.5.36
  mysql_query at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_query_cont at Base 5.5.35
  mysql_query_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_query_start at Base 5.5.35
  mysql_query_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_read_default_options at Base 5.5.35
+#MISSING: 5.5.36# mysql_read_query_result at Base 5.5.35
  mysql_read_query_result at libmariadbclient_16 5.5.36
  mysql_read_query_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_read_query_result_cont at Base 5.5.35
  mysql_read_query_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_read_query_result_start at Base 5.5.35
  mysql_read_query_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_connect at Base 5.5.35
  mysql_real_connect at libmariadbclient_16 5.5.36
  mysql_real_connect at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_connect_cont at Base 5.5.35
  mysql_real_connect_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_connect_start at Base 5.5.35
  mysql_real_connect_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_escape_string at Base 5.5.35
  mysql_real_escape_string at libmariadbclient_16 5.5.36
  mysql_real_escape_string at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_query at Base 5.5.35
  mysql_real_query at libmariadbclient_16 5.5.36
  mysql_real_query at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_query_cont at Base 5.5.35
  mysql_real_query_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_real_query_start at Base 5.5.35
  mysql_real_query_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_reconnect at Base 5.5.35
+#MISSING: 5.5.36# mysql_refresh at Base 5.5.35
  mysql_refresh at libmariadbclient_16 5.5.36
  mysql_refresh at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_refresh_cont at Base 5.5.35
  mysql_refresh_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_refresh_start at Base 5.5.35
  mysql_refresh_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_rollback at Base 5.5.35
  mysql_rollback at libmariadbclient_16 5.5.36
  mysql_rollback at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_rollback_cont at Base 5.5.35
  mysql_rollback_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_rollback_start at Base 5.5.35
  mysql_rollback_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_row_seek at Base 5.5.35
  mysql_row_seek at libmariadbclient_16 5.5.36
  mysql_row_seek at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_row_tell at Base 5.5.35
  mysql_row_tell at libmariadbclient_16 5.5.36
  mysql_row_tell at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_select_db at Base 5.5.35
  mysql_select_db at libmariadbclient_16 5.5.36
  mysql_select_db at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_select_db_cont at Base 5.5.35
  mysql_select_db_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_select_db_start at Base 5.5.35
  mysql_select_db_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_send_query at Base 5.5.35
  mysql_send_query at libmariadbclient_16 5.5.36
  mysql_send_query at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_send_query_cont at Base 5.5.35
  mysql_send_query_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_send_query_start at Base 5.5.35
  mysql_send_query_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_server_end at Base 5.5.35
  mysql_server_end at libmariadbclient_16 5.5.36
  mysql_server_end at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_server_init at Base 5.5.35
  mysql_server_init at libmariadbclient_16 5.5.36
  mysql_server_init at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_server_last_errno at Base 5.5.35
+#MISSING: 5.5.36# mysql_server_last_error at Base 5.5.35
+#MISSING: 5.5.36# mysql_set_character_set at Base 5.5.35
  mysql_set_character_set at libmariadbclient_16 5.5.36
  mysql_set_character_set at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_character_set_cont at Base 5.5.35
  mysql_set_character_set_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_character_set_start at Base 5.5.35
  mysql_set_character_set_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_local_infile_default at Base 5.5.35
  mysql_set_local_infile_default at libmariadbclient_16 5.5.36
  mysql_set_local_infile_default at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_local_infile_handler at Base 5.5.35
  mysql_set_local_infile_handler at libmariadbclient_16 5.5.36
  mysql_set_local_infile_handler at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_server_option at Base 5.5.35
  mysql_set_server_option at libmariadbclient_16 5.5.36
  mysql_set_server_option at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_server_option_cont at Base 5.5.35
  mysql_set_server_option_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_set_server_option_start at Base 5.5.35
  mysql_set_server_option_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_sha1_input at Base 5.5.35
+#MISSING: 5.5.36# mysql_sha1_reset at Base 5.5.35
+#MISSING: 5.5.36# mysql_sha1_result at Base 5.5.35
+#MISSING: 5.5.36# mysql_shutdown at Base 5.5.35
  mysql_shutdown at libmariadbclient_16 5.5.36
  mysql_shutdown at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_shutdown_cont at Base 5.5.35
  mysql_shutdown_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_shutdown_start at Base 5.5.35
  mysql_shutdown_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_socket_shutdown at Base 5.5.35
+#MISSING: 5.5.36# mysql_sqlstate at Base 5.5.35
  mysql_sqlstate at libmariadbclient_16 5.5.36
  mysql_sqlstate at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_ssl_set at Base 5.5.35
  mysql_ssl_set at libmariadbclient_16 5.5.36
  mysql_ssl_set at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stat at Base 5.5.35
  mysql_stat at libmariadbclient_16 5.5.36
  mysql_stat at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stat_cont at Base 5.5.35
  mysql_stat_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stat_start at Base 5.5.35
  mysql_stat_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stdin at Base 5.5.35
+#MISSING: 5.5.36# mysql_stmt_affected_rows at Base 5.5.35
  mysql_stmt_affected_rows at libmariadbclient_16 5.5.36
  mysql_stmt_affected_rows at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_attr_get at Base 5.5.35
  mysql_stmt_attr_get at libmariadbclient_16 5.5.36
  mysql_stmt_attr_get at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_attr_set at Base 5.5.35
  mysql_stmt_attr_set at libmariadbclient_16 5.5.36
  mysql_stmt_attr_set at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_bind_param at Base 5.5.35
  mysql_stmt_bind_param at libmariadbclient_16 5.5.36
  mysql_stmt_bind_param at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_bind_result at Base 5.5.35
  mysql_stmt_bind_result at libmariadbclient_16 5.5.36
  mysql_stmt_bind_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_close at Base 5.5.35
  mysql_stmt_close at libmariadbclient_16 5.5.36
  mysql_stmt_close at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_close_cont at Base 5.5.35
  mysql_stmt_close_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_close_start at Base 5.5.35
  mysql_stmt_close_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_data_seek at Base 5.5.35
  mysql_stmt_data_seek at libmariadbclient_16 5.5.36
  mysql_stmt_data_seek at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_errno at Base 5.5.35
  mysql_stmt_errno at libmariadbclient_16 5.5.36
  mysql_stmt_errno at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_error at Base 5.5.35
  mysql_stmt_error at libmariadbclient_16 5.5.36
  mysql_stmt_error at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_execute at Base 5.5.35
  mysql_stmt_execute at libmariadbclient_16 5.5.36
  mysql_stmt_execute at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_execute_cont at Base 5.5.35
  mysql_stmt_execute_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_execute_start at Base 5.5.35
  mysql_stmt_execute_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_fetch at Base 5.5.35
  mysql_stmt_fetch at libmariadbclient_16 5.5.36
  mysql_stmt_fetch at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_fetch_column at Base 5.5.35
  mysql_stmt_fetch_column at libmariadbclient_16 5.5.36
  mysql_stmt_fetch_column at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_fetch_cont at Base 5.5.35
  mysql_stmt_fetch_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_fetch_start at Base 5.5.35
  mysql_stmt_fetch_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_field_count at Base 5.5.35
  mysql_stmt_field_count at libmariadbclient_16 5.5.36
  mysql_stmt_field_count at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_free_result at Base 5.5.35
  mysql_stmt_free_result at libmariadbclient_16 5.5.36
  mysql_stmt_free_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_free_result_cont at Base 5.5.35
  mysql_stmt_free_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_free_result_start at Base 5.5.35
  mysql_stmt_free_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_init at Base 5.5.35
  mysql_stmt_init at libmariadbclient_16 5.5.36
  mysql_stmt_init at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_insert_id at Base 5.5.35
  mysql_stmt_insert_id at libmariadbclient_16 5.5.36
  mysql_stmt_insert_id at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_next_result at Base 5.5.35
  mysql_stmt_next_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_next_result_cont at Base 5.5.35
  mysql_stmt_next_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_next_result_start at Base 5.5.35
  mysql_stmt_next_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_num_rows at Base 5.5.35
  mysql_stmt_num_rows at libmariadbclient_16 5.5.36
  mysql_stmt_num_rows at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_param_count at Base 5.5.35
  mysql_stmt_param_count at libmariadbclient_16 5.5.36
  mysql_stmt_param_count at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_param_metadata at Base 5.5.35
  mysql_stmt_param_metadata at libmariadbclient_16 5.5.36
  mysql_stmt_param_metadata at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_prepare at Base 5.5.35
  mysql_stmt_prepare at libmariadbclient_16 5.5.36
  mysql_stmt_prepare at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_prepare_cont at Base 5.5.35
  mysql_stmt_prepare_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_prepare_start at Base 5.5.35
  mysql_stmt_prepare_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_reset at Base 5.5.35
  mysql_stmt_reset at libmariadbclient_16 5.5.36
  mysql_stmt_reset at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_reset_cont at Base 5.5.35
  mysql_stmt_reset_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_reset_start at Base 5.5.35
  mysql_stmt_reset_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_result_metadata at Base 5.5.35
  mysql_stmt_result_metadata at libmariadbclient_16 5.5.36
  mysql_stmt_result_metadata at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_row_seek at Base 5.5.35
  mysql_stmt_row_seek at libmariadbclient_16 5.5.36
  mysql_stmt_row_seek at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_row_tell at Base 5.5.35
  mysql_stmt_row_tell at libmariadbclient_16 5.5.36
  mysql_stmt_row_tell at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_send_long_data at Base 5.5.35
  mysql_stmt_send_long_data at libmariadbclient_16 5.5.36
  mysql_stmt_send_long_data at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_send_long_data_cont at Base 5.5.35
  mysql_stmt_send_long_data_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_send_long_data_start at Base 5.5.35
  mysql_stmt_send_long_data_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_sqlstate at Base 5.5.35
  mysql_stmt_sqlstate at libmariadbclient_16 5.5.36
  mysql_stmt_sqlstate at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_store_result at Base 5.5.35
  mysql_stmt_store_result at libmariadbclient_16 5.5.36
  mysql_stmt_store_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_store_result_cont at Base 5.5.35
  mysql_stmt_store_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_stmt_store_result_start at Base 5.5.35
  mysql_stmt_store_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_store_result at Base 5.5.35
  mysql_store_result at libmariadbclient_16 5.5.36
  mysql_store_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_store_result_cont at Base 5.5.35
  mysql_store_result_cont at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_store_result_start at Base 5.5.35
  mysql_store_result_start at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_thread_end at Base 5.5.35
  mysql_thread_end at libmariadbclient_16 5.5.36
  mysql_thread_end at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_thread_id at Base 5.5.35
  mysql_thread_id at libmariadbclient_16 5.5.36
  mysql_thread_id at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_thread_init at Base 5.5.35
  mysql_thread_init at libmariadbclient_16 5.5.36
  mysql_thread_init at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_thread_safe at Base 5.5.35
  mysql_thread_safe at libmariadbclient_16 5.5.36
  mysql_thread_safe at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_unix_port at Base 5.5.35
+#MISSING: 5.5.36# mysql_use_result at Base 5.5.35
  mysql_use_result at libmariadbclient_16 5.5.36
  mysql_use_result at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysql_warning_count at Base 5.5.35
  mysql_warning_count at libmariadbclient_16 5.5.36
  mysql_warning_count at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# mysys_usage_id at Base 5.5.35
+#MISSING: 5.5.36# net_buffer_length at Base 5.5.35
+#MISSING: 5.5.36# net_clear at Base 5.5.35
+#MISSING: 5.5.36# net_clear_error at Base 5.5.35
+#MISSING: 5.5.36# net_end at Base 5.5.35
+#MISSING: 5.5.36# net_field_length at Base 5.5.35
+#MISSING: 5.5.36# net_field_length_ll at Base 5.5.35
+#MISSING: 5.5.36# net_flush at Base 5.5.35
+#MISSING: 5.5.36# net_real_write at Base 5.5.35
+#MISSING: 5.5.36# net_realloc at Base 5.5.35
  net_realloc at libmariadbclient_16 5.5.36
  net_realloc at libmariadbclient_18 5.5.36
+#MISSING: 5.5.36# net_store_length at Base 5.5.35
+#MISSING: 5.5.36# net_write_command at Base 5.5.35
+#MISSING: 5.5.36# new_VioSSLAcceptorFd at Base 5.5.35
+#MISSING: 5.5.36# new_VioSSLConnectorFd at Base 5.5.35
+#MISSING: 5.5.36# normalize_dirname at Base 5.5.35
+#MISSING: 5.5.36# not_error_sqlstate at Base 5.5.35
+#MISSING: 5.5.36# number_to_datetime at Base 5.5.35
+#MISSING: 5.5.36# number_to_time at Base 5.5.35
+#MISSING: 5.5.36# octet2hex at Base 5.5.35
+#MISSING: 5.5.36# opt_flush_ok_packet at Base 5.5.35
+#MISSING: 5.5.36# pack_dirname at Base 5.5.35
+#MISSING: 5.5.36# pack_time at Base 5.5.35
+#MISSING: 5.5.36# packfrm at Base 5.5.35
+#MISSING: 5.5.36# plugin_list at Base 5.5.35
+#MISSING: 5.5.36# pop_dynamic at Base 5.5.35
+#MISSING: 5.5.36# print_defaults at Base 5.5.35
+#MISSING: 5.5.36# proc_info_hook at Base 5.5.35
+#MISSING: 5.5.36# pthread_dummy at Base 5.5.35
+#MISSING: 5.5.36# read_user_name at Base 5.5.35
+#MISSING: 5.5.36# reset_root_defaults at Base 5.5.35
+#MISSING: 5.5.36# resolve_charset at Base 5.5.35
+#MISSING: 5.5.36# resolve_collation at Base 5.5.35
+#MISSING: 5.5.36# run_plugin_auth at Base 5.5.35
+#MISSING: 5.5.36# scramble at Base 5.5.35
  scramble at libmariadbclient_16 5.5.36
  scramble at libmariadbclient_18 5.5.36
- set_dynamic at libmariadbclient_18 5.5.37
- strdup_root at libmariadbclient_18 5.5.37
- strend at libmariadbclient_18 5.5.37
- strfill at libmariadbclient_18 5.5.37
- strmake at libmariadbclient_18 5.5.37
- strmake_root at libmariadbclient_18 5.5.37
- strxmov at libmariadbclient_18 5.5.37
+#MISSING: 5.5.36# scramble_323 at Base 5.5.35
+#MISSING: 5.5.36# set_dynamic at Base 5.5.35
+ set_dynamic at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# set_mysql_error at Base 5.5.35
+#MISSING: 5.5.36# set_mysql_extended_error at Base 5.5.35
+#MISSING: 5.5.36# set_prealloc_root at Base 5.5.35
+#MISSING: 5.5.36# set_stmt_errmsg at Base 5.5.35
+#MISSING: 5.5.36# set_stmt_error at Base 5.5.35
+#MISSING: 5.5.36# set_zero_time at Base 5.5.35
+#MISSING: 5.5.36# sf_leaking_memory at Base 5.5.35
+#MISSING: 5.5.36# sha_const_key at Base 5.5.35
+#MISSING: 5.5.36# soundex_map at Base 5.5.35
+#MISSING: 5.5.36# sql_protocol_names_lib at Base 5.5.35
+#MISSING: 5.5.36# sql_protocol_typelib at Base 5.5.35
+#MISSING: 5.5.36# sslGetErrString at Base 5.5.35
+#MISSING: 5.5.36# sslaccept at Base 5.5.35
+#MISSING: 5.5.36# sslconnect at Base 5.5.35
+#MISSING: 5.5.36# str2int at Base 5.5.35
+#MISSING: 5.5.36# str_to_datetime at Base 5.5.35
+#MISSING: 5.5.36# str_to_time at Base 5.5.35
+#MISSING: 5.5.36# strcend at Base 5.5.35
+#MISSING: 5.5.36# strdup_root at Base 5.5.35
+ strdup_root at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strend at Base 5.5.35
+ strend at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strfill at Base 5.5.35
+ strfill at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strlength at Base 5.5.35
+#MISSING: 5.5.36# strmake at Base 5.5.35
+ strmake at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strmake_root at Base 5.5.35
+ strmake_root at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strmov_overlapp at Base 5.5.35
+#MISSING: 5.5.36# strnmov at Base 5.5.35
+#MISSING: 5.5.36# strxmov at Base 5.5.35
+ strxmov at libmariadbclient_18 5.5.40
+#MISSING: 5.5.36# strxnmov at Base 5.5.35
+#MISSING: 5.5.36# system_filename at Base 5.5.35
+#MISSING: 5.5.36# test_if_hard_path at Base 5.5.35
+#MISSING: 5.5.36# thd_lib_detected at Base 5.5.35
+#MISSING: 5.5.36# thr_set_sync_wait_callback at Base 5.5.35
+#MISSING: 5.5.36# timed_mutexes at Base 5.5.35
+#MISSING: 5.5.36# ullstr at Base 5.5.35
+#MISSING: 5.5.36# ulonglong2decimal at Base 5.5.35
+#MISSING: 5.5.36# unknown_sqlstate at Base 5.5.35
+#MISSING: 5.5.36# unpack_dirname at Base 5.5.35
+#MISSING: 5.5.36# unpack_fields at Base 5.5.35
+#MISSING: 5.5.36# unpack_filename at Base 5.5.35
+#MISSING: 5.5.36# unpack_time at Base 5.5.35
+#MISSING: 5.5.36# unpackfrm at Base 5.5.35
+#MISSING: 5.5.36# vio_blocking at Base 5.5.35
+#MISSING: 5.5.36# vio_buff_has_data at Base 5.5.35
+#MISSING: 5.5.36# vio_close at Base 5.5.35
+#MISSING: 5.5.36# vio_delete at Base 5.5.35
+#MISSING: 5.5.36# vio_description at Base 5.5.35
+#MISSING: 5.5.36# vio_end at Base 5.5.35
+#MISSING: 5.5.36# vio_errno at Base 5.5.35
+#MISSING: 5.5.36# vio_fastsend at Base 5.5.35
+#MISSING: 5.5.36# vio_fd at Base 5.5.35
+#MISSING: 5.5.36# vio_get_normalized_ip_string at Base 5.5.35
+#MISSING: 5.5.36# vio_getnameinfo at Base 5.5.35
+#MISSING: 5.5.36# vio_is_blocking at Base 5.5.35
+#MISSING: 5.5.36# vio_is_connected at Base 5.5.35
+#MISSING: 5.5.36# vio_is_no_name_error at Base 5.5.35
+#MISSING: 5.5.36# vio_keepalive at Base 5.5.35
+#MISSING: 5.5.36# vio_new at Base 5.5.35
+#MISSING: 5.5.36# vio_peer_addr at Base 5.5.35
+#MISSING: 5.5.36# vio_pending at Base 5.5.35
+#MISSING: 5.5.36# vio_poll_read at Base 5.5.35
+#MISSING: 5.5.36# vio_read at Base 5.5.35
+#MISSING: 5.5.36# vio_read_buff at Base 5.5.35
+#MISSING: 5.5.36# vio_reset at Base 5.5.35
+#MISSING: 5.5.36# vio_should_retry at Base 5.5.35
+#MISSING: 5.5.36# vio_socket_shutdown at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_blocking at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_close at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_delete at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_has_data at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_read at Base 5.5.35
+#MISSING: 5.5.36# vio_ssl_write at Base 5.5.35
+#MISSING: 5.5.36# vio_timeout at Base 5.5.35
+#MISSING: 5.5.36# vio_type at Base 5.5.35
+#MISSING: 5.5.36# vio_was_interrupted at Base 5.5.35
+#MISSING: 5.5.36# vio_write at Base 5.5.35
+#MISSING: 5.5.36# wait_for_free_space at Base 5.5.35
+#MISSING: 5.5.36# year_2000_handling at Base 5.5.35
 mysql_clear_password.so libmariadbclient18 #MINVER#
  _mysql_client_plugin_declaration_ at Base 5.5.35
diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index b2b7a2b..e2c9d5c 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,9 +1,6 @@
 # These are OK for -dev package
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-# OK, embedded has same source
+libmariadbd-dev: no-shlibs-control-file usr/lib/x86_64-linux-gnu/libmysqld.so.18
 libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
-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
+# OK, newer Debian should support xz
+libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-client-5.5.links b/debian/mariadb-client-5.5.links
index 0b86e87..247369f 100644
--- a/debian/mariadb-client-5.5.links
+++ b/debian/mariadb-client-5.5.links
@@ -1,6 +1,3 @@
 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 e45ad27..a33259f 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -1,6 +1,15 @@
-# OK, embedded has same source
+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
 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 93b19bf..f191979 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 5deb581..c7f96fc 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 90d7ccb..2f8573a 100644
--- a/debian/mariadb-client-core-5.5.lintian-overrides
+++ b/debian/mariadb-client-core-5.5.lintian-overrides
@@ -1,3 +1,5 @@
-# these libs are OK# OK, embedded has same source
+# these libs are OK
 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
new file mode 100644
index 0000000..03c5a5e
--- /dev/null
+++ b/debian/mariadb-client.lintian-overrides
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000..5ee222b
--- /dev/null
+++ b/debian/mariadb-common.lintian-overrides
@@ -0,0 +1,3 @@
+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 a4c65f3..424982a 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.5/nis_warning || true
+  db_input high mysql-server-5.1/nis_warning || true
   db_go
 fi
 
diff --git a/debian/mariadb-server-5.5.dirs b/debian/mariadb-server-5.5.dirs
index e23e5b0..a234d5f 100644
--- a/debian/mariadb-server-5.5.dirs
+++ b/debian/mariadb-server-5.5.dirs
@@ -2,6 +2,8 @@ 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 5d1244e..5539313 100644
--- a/debian/mariadb-server-5.5.install
+++ b/debian/mariadb-server-5.5.install
@@ -1,4 +1,3 @@
-etc/apparmor.d/usr.sbin.mysqld
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
 etc/mysql/debian-start
 usr/bin/aria_chk
@@ -34,12 +33,33 @@ 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 ff9ae25..3a724d0 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -1,6 +1,16 @@
-# Embedded from same source is OK
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
-# ash's buildin has no "-e" so use /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:199 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:213 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:221 /bin/echo
+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
diff --git a/debian/mariadb-server-5.5.manpages b/debian/mariadb-server-5.5.manpages
index ae9ebac..ce7300b 100644
--- a/debian/mariadb-server-5.5.manpages
+++ b/debian/mariadb-server-5.5.manpages
@@ -1,8 +1,3 @@
-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
@@ -15,13 +10,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.mysql-server.logrotate b/debian/mariadb-server-5.5.mysql-server.logrotate
index 05c2d68..0f0de51 100644
--- a/debian/mariadb-server-5.5.mysql-server.logrotate
+++ b/debian/mariadb-server-5.5.mysql-server.logrotate
@@ -1,8 +1,8 @@
-# - I put everything in one block and added sharedscripts, so that mysql gets
+# - I put everything in one block and added sharedscripts, so that mysql gets 
 #   flush-logs'd only once.
 #   Else the binary logs would automatically increase by n times every day.
 # - The error log is obsolete, messages go to syslog now.
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log {
+/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log {
 	daily
 	rotate 7
 	missingok
@@ -12,14 +12,14 @@
 	postrotate
 		test -x /usr/bin/mysqladmin || exit 0
 
-		# If this fails, check debian.conf!
+		# If this fails, check debian.conf! 
 		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
 		  # Really no mysqld or rather a missing debian-sys-maint user?
 		  # If this occurs and is not a error please report a bug.
 		  if ps cax | grep -q mysqld; then
  		    exit 1
-		  fi
+		  fi 
 		else
 		  $MYADMIN flush-logs
 		fi
diff --git a/debian/mariadb-server-5.5.postinst b/debian/mariadb-server-5.5.postinst
index 435b3c9..cb05f6e 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,7 +120,6 @@ 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
@@ -134,8 +133,6 @@ EOF
     # data directory and then somewhen gets purged by the admin.
     db_set mysql-server/postrm_remove_database false || true
 
-    # Clean up old flags before setting new one
-    rm $mysql_statedir/debian-*.flag
     # To avoid downgrades.
     touch $mysql_statedir/debian-5.5.flag
 
@@ -143,12 +140,12 @@ 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
-    bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
+    /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
     set -e
-
+    
     ## On every reconfiguration the maintenance user is recreated.
     #
     # - It is easier to regenerate the password every time but as people
@@ -167,15 +164,13 @@ 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
 	pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
         if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi
-        umask 066
         cat /dev/null > $dc
-        umask 022
         echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc
         echo "[client]"                                                    >>$dc
         echo "host     = localhost"                                        >>$dc
@@ -195,10 +190,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 80903a4..1f79890 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.5/postrm_remove_databases || true
+  db_input high mysql-server-5.1/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.5/postrm_remove_databases || true
+  db_get mysql-server-5.1/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!
@@ -63,8 +63,21 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
     rm -rf /var/run/mysqld # this directory is created by the init script, don't leave behind
     userdel mysql || true
   fi
+
+  # (normally) Automatically added by dh_installinit
+  if [ "$1" = "purge" ] ; then
+        update-rc.d mysql remove >/dev/null || exit 0
+  fi
+  # (normally) End automatically added section
+fi
+
+# (normally) Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+        db_purge
 fi
+# (normally) End automatically added section
 
-#DEBHELPER#
+# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed
 
 exit 0
diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst
index 25d3838..209d0c0 100644
--- a/debian/mariadb-server-5.5.preinst
+++ b/debian/mariadb-server-5.5.preinst
@@ -33,19 +33,21 @@ stop_server() {
     $cmd
     errno=$?
     set -e
-
+   
     # 0=ok, 100=no init script (fresh install)
     if [ "$errno" != 0 -a "$errno" != 100 ]; then
       echo "${cmd/ */} returned $errno" 1>&2
       echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
       echo "Stop it yourself and try again!" 1>&2
-      db_stop
+      db_stop  	
       exit 1
     fi
 }
 
 ################################ main() ##########################
 
+this_version=5.5
+
 # Show warning if old data exists
 if [ -d $DATADIR ]; then
   db_input high mariadb-server/oneway_migration || true
@@ -53,7 +55,6 @@ if [ -d $DATADIR ]; then
   db_get mariadb-server/oneway_migration || true
   if [ "$RET" = "false" ]; then
     echo "Aborting MariaDB installation." 1>&2
-    db_fset mariadb-server/oneway_migration seen false || true
     db_stop
     exit 1
   fi
@@ -70,25 +71,29 @@ if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /e
   exit 1
 fi
 
+# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades.
+#TODO
+
 # Safe the user from stupidities.
 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 "5.5" '<<' "$found_version"; then
+  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
     show_downgrade_warning=1
     break;
   fi
 done
 if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mariadb-server-5.5/really_downgrade seen false || true
-  db_input critical mariadb-server-5.5/really_downgrade || true
+  db_fset mariadb-server-$this_version/really_downgrade seen false || true
+  db_input medium mariadb-server-$this_version/really_downgrade || true
   db_go
-  db_get mariadb-server-5.5/really_downgrade || true
+  db_get mariadb-server-$this_version/really_downgrade || true
   if [ "$RET" = "true" ]; then
     rm -f $DATADIR/debian-*.flag
+    touch $DATADIR/debian-$this_version.flag
   else
-    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 "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 "$DATADIR/debian-*.flag and try installing again." 1>&2
     db_stop
     exit 1
@@ -109,7 +114,7 @@ fi
 # Now we have to ensure the following state:
 # /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false
 # /etc/group:  mysql:x:101:
-#
+# 
 # Sadly there could any state be present on the system so we have to
 # modify everything carefully i.e. not doing a chown before creating
 # the user etc...
@@ -160,7 +165,7 @@ if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4
 fi
 
 # Since the home directory was created before putting the user into
-# the mysql group and moreover we cannot guarantee that the
+# the mysql group and moreover we cannot guarantee that the 
 # permissions were correctly *before* calling this script, we fix them now.
 # In case we use NIS and no mysql user is present then this script should
 # better fail now than later..
diff --git a/debian/mariadb-server-core-5.5.lintian-overrides b/debian/mariadb-server-core-5.5.lintian-overrides
index 513688b..bc0f142 100644
--- a/debian/mariadb-server-core-5.5.lintian-overrides
+++ b/debian/mariadb-server-core-5.5.lintian-overrides
@@ -1,2 +1,3 @@
-# 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
new file mode 100644
index 0000000..67b32a9
--- /dev/null
+++ b/debian/mariadb-server.lintian-overrides
@@ -0,0 +1,2 @@
+# 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 699aa51..ef62d2b 100644
--- a/debian/mariadb-test-5.5.dirs
+++ b/debian/mariadb-test-5.5.dirs
@@ -19,6 +19,13 @@ 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
@@ -40,7 +47,11 @@ 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
@@ -52,6 +63,9 @@ 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 2242305..7f5b5ec 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -1,9 +1,20 @@
-# Embedded from same source is OK
+# 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
 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
-# 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/std_data/checkDBI_DBD-mysql.pl
 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
new file mode 100644
index 0000000..df3ff69
--- /dev/null
+++ b/debian/mariadb-test.lintian-overrides
@@ -0,0 +1,2 @@
+# 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/31_fix_replace_lookup_path.diff b/debian/patches/31_fix_replace_lookup_path.diff
deleted file mode 100644
index 4352950..0000000
--- a/debian/patches/31_fix_replace_lookup_path.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Otto Kekäläinen <otto at seravo.fi>
-Bug: https://mariadb.atlassian.net/browse/MDEV-7359
-Subject: MTR tests failed to start due to replace binary not found
-Last-Update: 2014-12-28
-
---- old/mysql-test/mysql-test-run.pl
-+++ new/mysql-test/mysql-test-run.pl
-@@ -2490,14 +2490,6 @@ sub environment_setup {
-                                  "$bindir/sql$opt_vs_config/mysql_tzinfo_to_sql");
-   $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
- 
--  # ----------------------------------------------------
--  # replace
--  # ----------------------------------------------------
--  my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
--                                 "$basedir/extra/replace",
--                                 "$path_client_bindir/replace");
--  $ENV{'REPLACE'}= native_path($exe_replace);
--
-   # Create an environment variable to make it possible
-   # to detect that valgrind is being used from test cases
-   $ENV{'VALGRIND_TEST'}= $opt_valgrind;
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 100644
new mode 100755
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
old mode 100644
new mode 100755
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 100644
new mode 100755
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
old mode 100644
new mode 100755
index 01839f4..1675969
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -1,6 +1,5 @@
-Author: Christian Hammers <ch at debian.org>
-Description: Removes unnecessary library dependencies. See #390692
-
+## 99-unnamed.dpatch by  <ch at debian.org>
+## DP: 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 100644
new mode 100755
index c171747..0d05e0e
--- a/debian/patches/50_mysql-test__db_test.diff
+++ b/debian/patches/50_mysql-test__db_test.diff
@@ -6,7 +6,7 @@
 ## DP: suite depends on them.
 --- old/mysql-test/mysql-test-run.pl	2009-06-16 14:24:09.000000000 +0200
 +++ new/mysql-test/mysql-test-run.pl	2009-07-04 00:03:34.000000000 +0200
-@@ -3578,6 +3578,11 @@ sub mysql_install_db {
+@@ -3567,6 +3567,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  
diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.diff b/debian/patches/61_replace_dash_with_bash_mbug675185.diff
old mode 100644
new mode 100755
diff --git a/debian/patches/75_man_syntax_fixes.diff b/debian/patches/75_man_syntax_fixes.diff
deleted file mode 100644
index c5d1ee3..0000000
--- a/debian/patches/75_man_syntax_fixes.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Colin Watson <cjwatson at 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 4a45d55..d139c3a 100644
--- a/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
+++ b/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
@@ -1,6 +1,3 @@
-Author: Otto Kekäläinen <otto at 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/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
old mode 100644
new mode 100755
index 52e94d6..cabfe0e
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -1,9 +1,8 @@
-Author: Otto Kekäläinen <otto at seravo.fi>
-Description: Remove upstream debian/* handling that is obsolete
+## DP: Remove hackish upstream manipulation of debian/* contents
 
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
-@@ -430,12 +430,6 @@
+@@ -455,12 +455,6 @@
  CONFIGURE_FILE(
      ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
  
diff --git a/debian/patches/series b/debian/patches/series
index 0165f56..20f2f9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
-31_fix_replace_lookup_path.diff
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff
 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
 99_remove_rename_mariadb-server_files_in.diff
diff --git a/debian/po/it.po b/debian/po/it.po
index b6cdfd6..6ba0ab1 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,13 +1,14 @@
-# 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 at tiscali.it>, 2006-2014.
+# 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 at tiscali.it>, 2006 - 2009.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-5.5 5.5.39 italian debconf templates\n"
+"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
 "POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2014-08-30 18:35+0200\n"
+"PO-Revision-Date: 2009-08-08 11:03+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
 "Language: it\n"
@@ -45,8 +46,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 sta per essere installata sia in grado "
-"di usare i database presenti."
+"Non è garantito che la versione che si sta installando sia in grado di usare "
+"i database presenti."
 
 #. Type: note
 #. Description
@@ -61,8 +62,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 un account "
-"utente locale con nome mysql con:"
+"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema locale un "
+"account utente per mysql con:"
 
 #. Type: note
 #. Description
@@ -71,8 +72,8 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Inoltre è opportuno verificare i permessi e la proprietà della directory /"
-"var/lib/mysql:"
+"Inoltre si devono verificare i permessi e la proprietà della directory /var/"
+"lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -87,8 +88,8 @@ msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
 msgstr ""
-"La directory /var/lib/mysql che contiene i database di MariaDB sta per "
-"essere eliminata."
+"La directory /var/lib/mysql contenente i database di MariaDB sta per essere "
+"eliminata."
 
 #. Type: boolean
 #. Description
@@ -115,7 +116,7 @@ msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
 msgstr ""
-"Anche se non è obbligatorio, si raccomanda d'impostare una password per "
+"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per "
 "l'utente d'amministrazione «root» di MariaDB."
 
 #. Type: password
@@ -159,11 +160,15 @@ 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 consultare il file /usr/share/doc/mariadb-"
+"Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-"
 "server-5.5/README.Debian."
 
 #. Type: error
@@ -182,7 +187,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 NDB Cluster"
+msgstr "È in uso un cluster NDB"
 
 #. Type: error
 #. Description
@@ -192,15 +197,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 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/."
+"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/."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:10001
 msgid "Really migrate to MariaDB?"
-msgstr "Migrare a MariaDB?"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -209,8 +214,6 @@ 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
@@ -220,6 +223,13 @@ msgid ""
 "and thus migration back to MySQL might not always work, at least not as "
 "automatically as migrating from MySQL to MariaDB."
 msgstr ""
-"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."
+
+#~ 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»."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index eaf3fa1..a1b77e3 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,26 +1,26 @@
-# Dutch mariadb po-debconf translation,
-# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mariadb package.
-# Vincent Zweije <zweije at xs4all.nl>, 2006.
-# Frans Spiesschaert <Frans.Spiesschaert at yucom.be>, 2014.
-# 
+# Dutch mysql-dfsg-5.1 po-debconf translation,
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# Vincent Zweije <zweije at xs4all.nl>, 2006.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-5.5_5.5.39-2\n"
+"Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
 "Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
 "POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2014-09-24 12:43+0200\n"
-"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
-"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
-"Language: nl\n"
+"PO-Revision-Date: 2006-02-19 10:20+0100\n"
+"Last-Translator: Thijs Kinkhorst <thijs at debian.org>\n"
+"Language-Team: Debian-Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:2001
+#, fuzzy
+#| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
 msgstr "Wilt u echt een oude versie herstellen?"
 
@@ -29,17 +29,24 @@ msgstr "Wilt u echt een oude versie herstellen?"
 #: ../mariadb-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr ""
-"Er bestaat een bestand genaamd /var/lib/mysql/debian-*.flag op dit systeem."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:2001
+#, fuzzy
+#| msgid ""
+#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
+#| "that a mysql-server package with a higher version has been installed "
+#| "before. It can not be guaranteed that this version can use its data."
 msgid ""
 "Such a file is an indication that a mariadb-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"Zulk een bestand geeft aan dat er eerder een pakket mariadb-server met een "
-"hogere versie is geinstalleerd."
+"Waarschuwing: waarschijnlijk is een hogere versie van het mariadb-server "
+"pakket geïnstalleerd geweest (het bestand /var/lib/mysql/debian-*.flag "
+"bestaat). Er is geen garantie dat de gegevensbestanden, bewerkt met die "
+"hogere versie, kunnen worden gebruikt met de versie van mysql die u nu "
+"installeert."
 
 #. Type: boolean
 #. Description
@@ -48,14 +55,14 @@ msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
-"Er is geen garantie dat de versie die u op dit moment installeert de huidige "
-"databases kan gebruiken."
 
 #. Type: note
 #. Description
 #: ../mariadb-server-5.5.templates:3001
+#, fuzzy
+#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
-msgstr "Belangrijke opmerking voor gebruikers van NIS/YP"
+msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!"
 
 #. Type: note
 #. Description
@@ -64,8 +71,6 @@ msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"Het gebruik van MariaDB onder NIS/YP vereist dat een mysql gebruikersaccount "
-"wordt toegevoegd aan het lokale systeem met:"
 
 #. Type: note
 #. Description
@@ -74,14 +79,12 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"U dient ook de permissies en eigenaren van de map /var/lib/mysql te "
-"controleren:"
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:4001
 msgid "Remove all MariaDB databases?"
-msgstr "Wilt u alle MariaDB-databases verwijderen?"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -90,76 +93,93 @@ msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
 msgstr ""
-"De map /var/lib/mysql die de MariaDB-databases bevat staat op het punt om "
-"verwijderd te worden."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:4001
+#, fuzzy
+#| msgid ""
+#| "The script is about to remove the data directory /var/lib/mysql. If it is "
+#| "planned to just install a higher MySQL version or if a different mysql-"
+#| "server package is already using it, the data should be kept."
 msgid ""
 "If you're removing the MariaDB package in order to later install a more "
 "recent version or if a different mariadb-server package is already using it, "
 "the data should be kept."
 msgstr ""
-"Als u het MariaDB-pakket verwijdert om later een meer recente versie te "
-"installeren of als een ander mariadb-server pakket het al gebruikt, zou de "
-"data behouden moeten worden."
+"Het script staat op het punt de datamap /var/lib/mysql te verwijderen. Als "
+"het plan alleen maar is om een hogere MariaDB versie te installeren, of als "
+"een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data "
+"moeten worden behouden."
 
 #. Type: password
 #. Description
 #: ../mariadb-server-5.5.templates:5001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MariaDB \"root\" user:"
 msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
 #: ../mariadb-server-5.5.templates:5001
+#, fuzzy
+#| msgid ""
+#| "It is highly recommended that you set a password for the MySQL "
+#| "administrative \"root\" user."
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
 msgstr ""
-"Hoewel niet verplicht, wordt het sterk aangeraden een wachtwoord in te "
-"stellen voor de administratieve MariaDB \"root\"-gebruiker."
+"Het wordt sterk aangeraden een wachtwoord in te stellen voor de "
+"administratieve MariaDB \"root\"-gebruiker."
 
 #. Type: password
 #. Description
 #: ../mariadb-server-5.5.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
-"Als dit veld leeg wordt gelaten, zal het wachtwoord niet worden veranderd."
 
 #. Type: password
 #. Description
 #: ../mariadb-server-5.5.templates:6001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MariaDB \"root\" user:"
-msgstr "Herhaal het wachtwoord voor de MariaDB \"root\"-gebruiker:"
+msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:7001
+#, fuzzy
+#| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MariaDB \"root\" user"
 msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:7001
+#, fuzzy
+#| msgid ""
+#| "It seems an error occurred while setting the password for the MySQL "
+#| "administrative user.  This may have happened because the user already has "
+#| "a password, or because there was a problem communicating with the MySQL "
+#| "server."
 msgid ""
 "An error occurred while setting the password for the MariaDB administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MariaDB server."
 msgstr ""
-"Er is een fout opgetreden bij het instellen van het wachtwoord voor de "
-"MariaDB administratieve gebruiker. Dat kan komen doordat de gebruiker al een "
-"wachtwoord heeft, of omdat er een probleem was bij het communiceren met de "
-"MariaDB-server."
+"Er lijkt een fout te zijn opgetreden bij het instellen van het wachtwoord "
+"van de MariaDB administratieve gebruiker. Dat kan komen doordat de gebruiker "
+"al een wachtwoord heeft, of omdat er een probleem was bij het communiceren "
+"met de MariaDB server."
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:7001
 msgid "You should check the account's password after the package installation."
 msgstr ""
-"U zou het wachtwoord van het account moeten controleren nadat het pakket is "
-"geinstalleerd."
 
 #. Type: error
 #. Description
@@ -168,27 +188,24 @@ msgid ""
 "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
 "more information."
 msgstr ""
-"Raadpleeg voor bijkomende informatie het bestand /usr/share/doc/mariadb-"
-"server-5.5/README.Debian."
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:8001
 msgid "Password input error"
-msgstr "Fout bij het invoeren van het wachtwoord"
+msgstr ""
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:8001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
-"De twee wachtwoorden die u invoerde waren niet gelijk. Probeer opnieuw."
 
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:9001
 msgid "NDB Cluster seems to be in use"
-msgstr "De NDB-cluster lijkt in gebruik te zijn"
+msgstr ""
 
 #. Type: error
 #. Description
@@ -198,15 +215,12 @@ msgid ""
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 biedt niet langer ondersteuning voor NDB Cluster. Gelieve over te "
-"schakelen op het nieuwe pakket mysql-cluster en verwijder alle regels die "
-"beginnen met \"ndb\" uit alle configuratiebestanden onder /etc/mysql/."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:10001
 msgid "Really migrate to MariaDB?"
-msgstr "wilt u echt overschakelen op MariaDB?"
+msgstr ""
 
 #. Type: boolean
 #. Description
@@ -215,8 +229,6 @@ msgid ""
 "MariaDB is a drop-in replacement for MySQL. It will use your current "
 "configuration file (my.cnf) and current databases."
 msgstr ""
-"MariaDB is een volwaardige vervanger voor MySQL. Het zal de bestaande "
-"configuratiebestanden (my.cnf) en de bestaande databases gebruiken."
 
 #. Type: boolean
 #. Description
@@ -226,6 +238,82 @@ msgid ""
 "and thus migration back to MySQL might not always work, at least not as "
 "automatically as migrating from MySQL to MariaDB."
 msgstr ""
-"Merk op dat MariaDB een aantal uitbreidingen heeft die niet bestaan in "
-"MySQL. Daardoor zal terug overschakelen op MySQL niet altijd lukken, of "
-"althans niet even automatisch als overschakelen van MySQL op MariaDB."
+
+#, fuzzy
+#~| msgid "Should MySQL start on boot?"
+#~ msgid "Start the MariaDB server on boot?"
+#~ msgstr "Moet MariaDB starten als de computer start?"
+
+#, fuzzy
+#~| msgid ""
+#~| "The MySQL can start automatically on boot time or only if you manually "
+#~| "type '/etc/init.d/mysql start'."
+#~ msgid ""
+#~ "The MariaDB server can be launched automatically at boot time or manually "
+#~ "with the '/etc/init.d/mysql start' command."
+#~ msgstr ""
+#~ "MariaDB kan automatisch starten bij het starten van de computer, of "
+#~ "slechts wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
+
+#~ msgid ""
+#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
+#~ msgstr ""
+#~ "Moet u MySQL-verbindingen accepteren van computers die Debian \"sarge\" "
+#~ "of ouder draaien?"
+
+#, fuzzy
+#~| msgid ""
+#~| "The way passwords were stored was not very secure. This has been "
+#~| "improved with the drawback that clients (e.g. PHP) from hosts running "
+#~| "Debian 3.1 Sarge will not be able to connect to account which are new or "
+#~| "whose password have been changed. See /usr/share/doc/mysql-server-5.1/"
+#~| "README.Debian."
+#~ msgid ""
+#~ "In old versions of MySQL clients on Debian, passwords were not stored "
+#~ "securely. This has been improved since then, however clients (such as "
+#~ "PHP) from hosts running Debian 3.1 Sarge will not be able to connect to "
+#~ "recent accounts or accounts whose password have been changed."
+#~ msgstr ""
+#~ "De wijze waarop wachtwoorden werden bewaard was niet erg veilig. Dit is "
+#~ "verbeterd, maar helaas zullen programma's van computers die Debian 3.1 "
+#~ "Sarge draaien, geen verbinding meer kunnen maken met accounts die nieuw "
+#~ "zijn, of waarvan het wachtwoord is gewijzigd. Zie /usr/share/doc/mysql-"
+#~ "server-5.1/README.Debian."
+
+#~ msgid ""
+#~ "To use mysql you must install an equivalent user and group to the "
+#~ "following and ensure yourself that /var/lib/mysql has the right "
+#~ "permissions (the uid/gid may be different)."
+#~ msgstr ""
+#~ "Om mysql te gebruiken dient u een gebruiker en groep aan te maken, "
+#~ "gelijkwaardig aan onderstaand voorbeeld, en u dient ervoor te zorgen dat /"
+#~ "var/lib/mysql de bijbehorende toegangsrechten heeft (uid en gid mogen "
+#~ "anders zijn)."
+
+#~ msgid ""
+#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
+#~ msgstr ""
+#~ "/etc/passwd:      mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false"
+
+#~ msgid "/etc/group:       mysql:x:101:"
+#~ msgstr "/etc/group:       mysql:x:101:"
+
+#~ msgid "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
+#~ msgstr "/var/lib/mysql:   drwxr-xr-x   mysql    mysql"
+
+#~ msgid "Remove the databases used by all MySQL versions?"
+#~ msgstr "Databases verwijderen die door alle MySQL versies worden gebruikt?"
+
+#~ msgid ""
+#~ "If you do not provide a password no changes will be made to the account."
+#~ msgstr ""
+#~ "Indien u geen wachtwoord opgeeft zal het account niet worden gewijzigd."
+
+#~ msgid ""
+#~ "When installation finishes, you should verify that the account is "
+#~ "properly protected with a password (see README.Debian for more "
+#~ "information)."
+#~ msgstr ""
+#~ "Wanneer de installatie klaar is, dient u te verifiëren dat het account "
+#~ "netjes beschermd is met een wachtwoord (zie README.Debian voor meer "
+#~ "informatie)."
diff --git a/debian/rules b/debian/rules
index a936a70..ce817d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,6 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
     TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
 endif
 
-# Skip TokuDB if arch is not amd64
-ifneq ($(ARCH), amd64)
-    TOKUDB_OPT:=-DWITHOUT_TOKUDB=true
-endif
-
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
@@ -34,22 +29,6 @@ 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
@@ -83,22 +62,19 @@ override_dh_auto_clean:
 	dh_testroot
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	rm -rf $(BUILDDIR)
-	debconf-updatepo # Update po-files when clean runs before each build
+	debconf-updatepo
+
+override_dh_auto_configure: configure-stamp
 
 override_dh_prep:
         # Don't clean /tmp/ away, it is needed by all binary packages
 
-override_dh_auto_configure:
+# We explicitly set -DINSTALL_SUPPORTFILESDIR as it is incorrect in upstream
+# sources (will be fixed in 5.5.30).
+configure-stamp:
 	@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
@@ -110,45 +86,56 @@ endif
 	# 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:-"/usr/local/bin:/usr/bin:/bin"} \
+	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/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) \
-	    -$(MAKEFLAGS) \
-	    $(TOKUDB_OPT) \
+		$(USE_STATIC_MYSQLD) \
 	    -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 $@
 
-# This is needed, otherwise 'make test' will run before binaries have been built
-override_dh_auto_build:
+# 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:
 	@echo "RULES.$@"
-	cd $(builddir) && $(MAKE)
+	cd $(builddir) && $(MAKE) $(AM_EXTRA_MAKEFLAGS)
 	touch $@
 
 override_dh_auto_test:
 	@echo "RULES.$@"
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ;
 endif
 
-override_dh_auto_install:
+override_dh_auto_install: auto_install-stamp
+
+auto_install-stamp:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
 	
-	# 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
-	
+	# 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/
 	mkdir -p $(TMP)/etc/mysql/conf.d/
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	
@@ -172,6 +159,11 @@ override_dh_auto_install:
 	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 \
@@ -188,12 +180,6 @@ override_dh_auto_install:
 	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 $@
@@ -209,6 +195,14 @@ 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 93a39ce..aff65fe 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,7 +1 @@
-# 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
deleted file mode 100644
index 135d675..0000000
--- a/debian/upstream/signing-key.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------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 3ea2544..a58143b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,10 +1,7 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/,uversionmangle=s/-(rc|beta)/$1/,pasv \
-   ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.5.([\d\.]*(?:-beta|-rc)?)/source/mariadb-([\d\.]*(?:-beta|-rc)?).tar.gz \
+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
 
 # 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

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git



More information about the Pkg-mysql-commits mailing list