Imported debian*/ from 5.5.40-0ubuntu0.14.10.1

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

debian/mariadb-client-5.5.menu

 # 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"

debian/mariadb-client-core-5.5.lintian-overrides

-# these libs are OK
+# these libs are OK# OK, embedded has same source
 mariadb-client-core-5.5: embedded-library usr/bin/mysql: libmysqlclient
 mariadb-client-core-5.5: embedded-library usr/bin/mysqlcheck: libmysqlclient
-# OK in neẃer Debian, includes support for xz
-mariadb-client-core-5.5: data.tar.xz-member-without-dpkg-pre-depends

debian/mariadb-client.lintian-overrides

-# OK in neẃer Debian, includes support for xz
-mariadb-client: data.tar.xz-member-without-dpkg-pre-depends
-

debian/mariadb-common.lintian-overrides

-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

debian/mariadb-server-5.5.config

@@ -11,7 +11,7 @@ CNF=/etc/mysql/my.cnf
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.1/nis_warning || true
+  db_input high mysql-server-5.5/nis_warning || true
   db_go
 fi
 

debian/mariadb-server-5.5.dirs

@@ -2,8 +2,6 @@ etc/init.d
 etc/logrotate.d
 etc/mysql/conf.d
 usr/bin
-usr/sbin
-usr/share/man/man8
 usr/share/mysql
 usr/share/doc/mariadb-server-5.5
 var/lib/mysql-upgrade

debian/mariadb-server-5.5.install

@@ -33,33 +33,12 @@ usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
+usr/lib/mysql/plugin/server_audit.so
 usr/lib/mysql/plugin/sphinx.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/share/doc/mariadb-server-5.5/INFO_BIN
 usr/share/doc/mariadb-server-5.5/INFO_SRC
 usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
-usr/share/man/man1/innochecksum.1
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/myisam_ftdump.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-usr/share/man/man1/resolve_stack_dump.1
-usr/share/man/man1/resolveip.1
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt

debian/mariadb-server-5.5.lintian-overrides

+# Embedded from same source is OK
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/auth_pam.so
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/dialog.so
-mariadb-server-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqlbinlog.1.gz 1313: warning [p 9, 1.8i, div `3tbd3,2', 0.8i]: can't break line
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_chk
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_dump_log
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_ftdump
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_pack
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_read_log
-mariadb-server-5.5: binary-without-manpage usr/bin/mysql_plugin
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:146 /bin/bash
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:194 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:208 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:216 /bin/echo
-# OK in neẃer Debian, includes support for xz
-mariadb-server-5.5: data.tar.xz-member-without-dpkg-pre-depends
+# ash's buildin has no "-e" so use /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:195 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:209 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:217 /bin/echo

debian/mariadb-server-5.5.manpages

+debian/tmp/usr/share/man/man1/aria_chk.1
+debian/tmp/usr/share/man/man1/aria_dump_log.1
+debian/tmp/usr/share/man/man1/aria_ftdump.1
+debian/tmp/usr/share/man/man1/aria_pack.1
+debian/tmp/usr/share/man/man1/aria_read_log.1
 debian/tmp/usr/share/man/man1/msql2mysql.1
 debian/tmp/usr/share/man/man1/myisamchk.1
 debian/tmp/usr/share/man/man1/myisam_ftdump.1
@@ -10,13 +15,13 @@ debian/tmp/usr/share/man/man1/mysqld_multi.1
 debian/tmp/usr/share/man/man1/mysqld_safe.1
 debian/tmp/usr/share/man/man1/mysqlhotcopy.1
 debian/tmp/usr/share/man/man1/mysql_install_db.1
+debian/tmp/usr/share/man/man1/mysql_plugin.1
 debian/tmp/usr/share/man/man1/mysql_secure_installation.1
 debian/tmp/usr/share/man/man1/mysql_setpermission.1
+debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
 debian/tmp/usr/share/man/man1/mysql_upgrade.1
 debian/tmp/usr/share/man/man1/mysql_zap.1
 debian/tmp/usr/share/man/man1/perror.1
 debian/tmp/usr/share/man/man1/replace.1
 debian/tmp/usr/share/man/man1/resolveip.1
 debian/tmp/usr/share/man/man1/resolve_stack_dump.1
-debian/tmp/usr/share/man/man1/innochecksum.1
-debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1

debian/mariadb-server-5.5.postinst

@@ -98,7 +98,7 @@ removed your symlink (see #182747 and others).  the mysql packages noticed
 that this happened, and as a workaround have restored it.  however, because
 /var/lib/mysql seems to have been re-created in the meantime, and because
 we don't want to rm -rf something we don't know as much about, we are going
-to leave this unexpected directory here.  If your database looks normal,
+to leave this unexpected directory here. If your database looks normal,
 and this is not a symlink to your database, you should be able to blow
 this all away.
 
@@ -120,6 +120,7 @@ EOF
     set +e
     chown -R 0:0 $mysql_datadir
     chown -R mysql $mysql_statedir
+    chown -R mysql $mysql_rundir
     chown -R mysql:adm $mysql_newlogdir;	chmod 2750 $mysql_newlogdir;
     for i in log err; do
       touch             $mysql_logdir/mysql.$i
@@ -140,10 +141,10 @@ EOF
     # This will fail if we are upgrading an existing database; in this case
     # mysql_upgrade, called from the /etc/init.d/mysql start script, will
     # handle things.
-    # Debian: beware of the bashisms... 
-    # Debian: can safely run on upgrades with existing databases 
+    # Debian: beware of the bashisms...
+    # Debian: can safely run on upgrades with existing databases
     set +e
-    /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
     set -e
     
     ## On every reconfiguration the maintenance user is recreated.
@@ -164,7 +165,7 @@ EOF
     #   the old query which always succeeds and then the new which may or may not.
 
     # recreate the credentials file if not present or without mysql_upgrade stanza
-    dc=$mysql_cfgdir/debian.cnf; 
+    dc=$mysql_cfgdir/debian.cnf;
     if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
         pass="`sed -n 's/^[     ]*password *= *// p' $dc | head -n 1`"
     else
@@ -190,10 +191,10 @@ EOF
 
     # update privilege tables
     password_column_fix_query=`/bin/echo -e \
-        "USE mysql\n" \
-        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
+        "USE mysql;\n" \
+        "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"`
     replace_query=`/bin/echo -e \
-        "USE mysql\n" \
+        "USE mysql;\n" \
         "SET sql_mode='';\n" \
         "REPLACE INTO user SET " \
         "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \

debian/mariadb-server-5.5.postrm

@@ -46,15 +46,15 @@ esac
 #
 # - Do NOT purge logs or data if another mysql-sever* package is installed (#307473)
 # - Remove the mysql user only after all his owned files are purged.
-#   
+#
 if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then
   # we remove the mysql user only after all his owned files are purged
   rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
   rm -rf /var/log/mysql
 
-  db_input high mysql-server-5.1/postrm_remove_databases || true
+  db_input high mysql-server-5.5/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.1/postrm_remove_databases || true
+  db_get mysql-server-5.5/postrm_remove_databases || true
   if [ "$RET" = "true" ]; then
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!

debian/mariadb-server-5.5.preinst

@@ -46,8 +46,6 @@ stop_server() {
 
 ################################ main() ##########################
 
-this_version=5.5
-
 # Show warning if old data exists
 if [ -d $DATADIR ]; then
   db_input high mariadb-server/oneway_migration || true
@@ -78,22 +76,22 @@ fi
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
   found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
-  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
+  if dpkg --compare-versions "5.5" '<<' "$found_version"; then
     show_downgrade_warning=1
     break;
   fi
 done
 if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mariadb-server-$this_version/really_downgrade seen false || true
-  db_input medium mariadb-server-$this_version/really_downgrade || true
+  db_fset mariadb-server-5.5/really_downgrade seen false || true
+  db_input medium mariadb-server-5.5/really_downgrade || true
   db_go
-  db_get mariadb-server-$this_version/really_downgrade || true
+  db_get mariadb-server-5.5/really_downgrade || true
   if [ "$RET" = "true" ]; then
     rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-$this_version.flag
+    touch $DATADIR/debian-5.5.flag
   else
-    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
-    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
+    echo "Aborting downgrade from (at least) $found_version to 5.5." 1>&2
+    echo "If are sure you want to downgrade to 5.5, remove the file" 1>&2
     echo "$DATADIR/debian-*.flag and try installing again." 1>&2
     db_stop
     exit 1

debian/mariadb-server-core-5.5.lintian-overrides

+# 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

debian/mariadb-server.lintian-overrides

-# OK in neẃer Debian, includes support for xz
-mariadb-server: data.tar.xz-member-without-dpkg-pre-depends

debian/mariadb-test-5.5.dirs

@@ -19,13 +19,6 @@ usr/share/mysql/mysql-test/suite/parts
 usr/share/mysql/mysql-test/suite/parts/inc
 usr/share/mysql/mysql-test/suite/parts/t
 usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/rpl_ndb
-usr/share/mysql/mysql-test/suite/rpl_ndb/t
-usr/share/mysql/mysql-test/suite/rpl_ndb/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
 usr/share/mysql/mysql-test/suite/rpl
 usr/share/mysql/mysql-test/suite/rpl/t
 usr/share/mysql/mysql-test/suite/rpl/r
@@ -47,11 +40,7 @@ usr/share/mysql/mysql-test/suite/jp/r
 usr/share/mysql/mysql-test/suite/jp/include
 usr/share/mysql/mysql-test/suite/jp/std_data
 usr/share/mysql/mysql-test/suite/ndb
-usr/share/mysql/mysql-test/suite/ndb/t
-usr/share/mysql/mysql-test/suite/ndb/r
 usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/maria/t
-usr/share/mysql/mysql-test/suite/maria/r
 usr/share/mysql/mysql-test/suite/funcs_2
 usr/share/mysql/mysql-test/suite/funcs_2/lib
 usr/share/mysql/mysql-test/suite/funcs_2/t
@@ -63,9 +52,6 @@ usr/share/mysql/mysql-test/suite/binlog
 usr/share/mysql/mysql-test/suite/binlog/t
 usr/share/mysql/mysql-test/suite/binlog/r
 usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/ndb_team
-usr/share/mysql/mysql-test/suite/ndb_team/t
-usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors

debian/mariadb-test-5.5.lintian-overrides

-# OK to have embedded libraries in test suite
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmariadbclient
-# in modern Debian this xz support exists, this should not matter anymore
-mariadb-test-5.5: data.tar.xz-member-without-dpkg-pre-depends
-# Ask help from upstream to fix these later
+# Embedded from same source is OK
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmysqlclient
+# OK, file part of test suite
 mariadb-test-5.5: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/std_data/checkDBI_DBD-mysql.pl
+# This file is designed to run with 'perl checksum.pl' and is not possible to run directly
 mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/long_tmpdir-master.sh
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/lowercase_mixed_tmpdir-master.sh
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world_schema.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/collections/default.weekly

debian/mariadb-test.lintian-overrides

-# in modern Debian this xz support exists, this should not matter anymore
-mariadb-test: data.tar.xz-member-without-dpkg-pre-depends