Documentation updates and typofixes.

debian/README.Maintainer

@@ -167,3 +167,10 @@ 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)
+

debian/libmariadbd-dev.lintian-overrides

 # These are OK for -dev package
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-# OK to have embedded from same source
+# OK, embedded has same source
 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

debian/mariadb-client-5.5.manpages

@@ -11,4 +11,4 @@ debian/additions/mysqlreport.1
 debian/tmp/usr/share/man/man1/mysqlshow.1
 debian/tmp/usr/share/man/man1/mysqlslap.1
 debian/tmp/usr/share/man/man1/mysql_waitpid.1
-debian/tmp/usr/share/man/man1/innochecksum.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

debian/mariadb-server-5.5.lintian-overrides

 # 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: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
+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.mysql.init

@@ -106,7 +106,7 @@ case "${1:-''}" in
 	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
 
 	    # Start MariaDB!
-  	    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
+	    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
 
 	    # 6s was reported in #352070 to be too few when using ndbcluster
 	    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do

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,8 +141,8 @@ 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
     set -e
@@ -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,7 +46,7 @@ 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}

debian/mariadb-server-5.5.preinst

@@ -46,8 +46,6 @@ stop_server() {
 
 ################################ main() ##########################
 
-
-
 # Show warning if old data exists
 if [ -d $DATADIR ]; then
   db_input high mariadb-server/oneway_migration || true

debian/rules

@@ -21,8 +21,6 @@ ifneq ($(ARCH), amd64)
     TOKUDB_OPT:=-DWITHOUT_TOKUDB=true
 endif
 
-Koulut alkaa, ja kohta myös koodikerho!  http://koodikerho.fi/
-
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++