[Pkg-mysql-commits] [mariadb-5.5] 02/03: Imported from master branch debian/* of level 5.5.41
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.10
in repository mariadb-5.5.
commit 3cf85c04fe3209db49c00b354782b2f4f87f4d16
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Mon Dec 29 00:44:11 2014 +0200
Imported from master branch debian/* of level 5.5.41
---
debian/changelog | 14 +
debian/control | 21 +-
debian/dist/Debian/control | 7 +-
debian/dist/Ubuntu/control | 7 +-
debian/gbp.conf | 2 +-
debian/mariadb-server-5.5.install | 1 +
debian/mariadb-server-5.5.lintian-overrides | 6 +-
debian/mariadb-server-5.5.mysql-server.logrotate | 8 +-
debian/mariadb-server-5.5.postinst | 6 +-
debian/mariadb-server-5.5.postrm | 15 +-
debian/mariadb-server-5.5.preinst | 15 +-
debian/mariadb-server-5.5.py | 22 +-
debian/patches/31_fix_replace_lookup_path.diff | 22 ++
debian/patches/50_mysql-test__db_test.diff | 2 +-
debian/patches/90_spelling.diff | 368 ---------------------
.../99_remove_rename_mariadb-server_files_in.diff | 2 +-
debian/patches/series | 2 +-
debian/po/nl.po | 194 +++--------
debian/watch | 11 +-
19 files changed, 151 insertions(+), 574 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index add9ae6..c31328c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mariadb-5.5 (5.5.41-0ubuntu0.14.10.1) utopic-updates; urgency=low
+
+ * New upstream release
+ * Sync packaging with latest 5.5 in Debian to fix multiple small issues
+ * Updated Dutch translation by Frans Spiesschaert
+ * 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. (LP: #1392539)
+
+ -- Otto Kekäläinen <otto at seravo.fi> Mon, 29 Dec 2014 00:45:02 +0200
+
mariadb-5.5 (5.5.40-0ubuntu0.14.10.1) utopic-security; urgency=medium
* SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1391676)
diff --git a/debian/control b/debian/control
index cb631f3..5bad201 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: bison,
dh-apparmor,
hardening-wrapper,
libaio-dev [linux-any],
- libjemalloc-dev [linux-any],
+ libjemalloc-dev (>= 3.0.0) [linux-any],
libncurses5-dev (>= 5.0-6),
libpam0g-dev,
libreadline-gplv2-dev,
@@ -26,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://git.debian.org/git/pkg-mysql/mariadb-5.5.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mariadb-5.5.git
+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
Package: libmariadbclient18
Section: libs
@@ -126,8 +126,16 @@ Depends: debianutils (>=1.6),
${shlibs:Depends}
Recommends: libdbd-mysql-perl (>= 1.2202)
Conflicts: mysql-client-core-5.5, mysql-client-core-5.6
-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
+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
Provides: virtual-mysql-client
Description: MariaDB database client binaries
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -186,8 +194,7 @@ Architecture: any
Suggests: mailx, mariadb-test, tinyca
Recommends: libhtml-template-perl
Pre-Depends: adduser (>= 3.40), debconf, mariadb-common
-Depends: bsdutils,
- libdbi-perl,
+Depends: libdbi-perl,
lsb-base (>= 3.0-10),
mariadb-client-5.5 (>= ${source:Version}),
mariadb-server-core-5.5 (>= ${binary:Version}),
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index c28ec44..104917d 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,7 +4,7 @@ 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
+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
@@ -191,7 +191,10 @@ Architecture: any
Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
+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,
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 0c4f8ea..0c33163 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,7 +4,7 @@ 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
+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
@@ -185,7 +185,10 @@ Architecture: any
Suggests: tinyca, mailx, mariadb-test
Recommends: libhtml-template-perl
Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-5.5 (>= ${binary:Version})
+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,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bd69fd3..f446b83 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
-debian-branch = master
+debian-branch = ubuntu-14.10
pristine-tar = True
diff --git a/debian/mariadb-server-5.5.install b/debian/mariadb-server-5.5.install
index 82e4310..5d1244e 100644
--- a/debian/mariadb-server-5.5.install
+++ b/debian/mariadb-server-5.5.install
@@ -1,3 +1,4 @@
+etc/apparmor.d/usr.sbin.mysqld
etc/mysql/conf.d/mysqld_safe_syslog.cnf
etc/mysql/debian-start
usr/bin/aria_chk
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 363c175..ff9ae25 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -1,6 +1,6 @@
# 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: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
+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
diff --git a/debian/mariadb-server-5.5.mysql-server.logrotate b/debian/mariadb-server-5.5.mysql-server.logrotate
index 0f0de51..05c2d68 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.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.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 b73c35c..435b3c9 100644
--- a/debian/mariadb-server-5.5.postinst
+++ b/debian/mariadb-server-5.5.postinst
@@ -134,6 +134,8 @@ 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
@@ -146,7 +148,7 @@ EOF
set +e
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
@@ -171,7 +173,9 @@ EOF
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
diff --git a/debian/mariadb-server-5.5.postrm b/debian/mariadb-server-5.5.postrm
index e01eb17..80903a4 100644
--- a/debian/mariadb-server-5.5.postrm
+++ b/debian/mariadb-server-5.5.postrm
@@ -63,21 +63,8 @@ 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
-# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed
+#DEBHELPER#
exit 0
diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst
index f206b58..25d3838 100644
--- a/debian/mariadb-server-5.5.preinst
+++ b/debian/mariadb-server-5.5.preinst
@@ -33,13 +33,13 @@ 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
}
@@ -53,6 +53,7 @@ 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
@@ -69,9 +70,6 @@ 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
@@ -83,12 +81,11 @@ for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
done
if [ "$show_downgrade_warning" = 1 ]; then
db_fset mariadb-server-5.5/really_downgrade seen false || true
- db_input medium mariadb-server-5.5/really_downgrade || true
+ db_input critical mariadb-server-5.5/really_downgrade || true
db_go
db_get mariadb-server-5.5/really_downgrade || true
if [ "$RET" = "true" ]; then
rm -f $DATADIR/debian-*.flag
- touch $DATADIR/debian-5.5.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
@@ -112,7 +109,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...
@@ -163,7 +160,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-5.5.py b/debian/mariadb-server-5.5.py
index a1372a3..ebfc3c0 100644
--- a/debian/mariadb-server-5.5.py
+++ b/debian/mariadb-server-5.5.py
@@ -4,6 +4,7 @@
Author: Mathias Gug <mathias.gug at canonical.com>
'''
+from __future__ import print_function, unicode_literals
import os, os.path
from apport.hookutils import *
@@ -29,24 +30,23 @@ def add_info(report):
report[key] += line + '\n'
except IndexError:
continue
- 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
+ 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')
_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'] = unicode(os.listdir('/var/lib/mysql'))
+ report['MySQLVarLibDirListing'] = str(os.listdir('/var/lib/mysql'))
except OSError:
- report['MySQLVarLibDirListing'] = unicode(False)
+ report['MySQLVarLibDirListing'] = str(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/patches/31_fix_replace_lookup_path.diff b/debian/patches/31_fix_replace_lookup_path.diff
new file mode 100644
index 0000000..4352950
--- /dev/null
+++ b/debian/patches/31_fix_replace_lookup_path.diff
@@ -0,0 +1,22 @@
+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/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
index 0d05e0e..c171747 100644
--- 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
-@@ -3567,6 +3567,11 @@ sub mysql_install_db {
+@@ -3578,6 +3578,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
diff --git a/debian/patches/90_spelling.diff b/debian/patches/90_spelling.diff
deleted file mode 100644
index 4abd52e..0000000
--- a/debian/patches/90_spelling.diff
+++ /dev/null
@@ -1,368 +0,0 @@
-Author: Otto Kekäläinen <otto at seravo.fi>
-Description: Fix spelling of preceding, specified, received, additionally
-
---- a/include/mysql_com.h
-+++ b/include/mysql_com.h
-@@ -110,7 +110,7 @@ enum enum_server_command
- #define MYSQL_TYPE_VIRTUAL 245
- /*
- Length of random string sent by server on handshake; this is also length of
-- obfuscated password, recieved from client
-+ obfuscated password, received from client
- */
- #define SCRAMBLE_LENGTH 20
- #define SCRAMBLE_LENGTH_323 8
---- a/man/mysql-test-run.pl.1
-+++ b/man/mysql-test-run.pl.1
-@@ -332,7 +332,7 @@ is defined so that
- can invoke itself with
- exec $MYSQL_TEST\&.
- .PP
--Other tests may refer to the last three variables listed in the preceeding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
-+Other tests may refer to the last three variables listed in the preceding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
- $MYSQL_TMP_DIR/\fIfile_name\fR\&.
- .PP
- If you are running
---- a/man/mysqldump.1
-+++ b/man/mysqldump.1
-@@ -1261,7 +1261,7 @@ to point the slave to the correct master server host\&. Add any such parameters
- .\" max-allowed-packet option: mysqldump
- \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
- .sp
--Sets the maximum packet length to send to or recieve from server\&.
-+Sets the maximum packet length to send to or receive from server\&.
- .RE
- .sp
- .RS 4
---- a/mysql-test/mysql-test-run.pl
-+++ b/mysql-test/mysql-test-run.pl
-@@ -6489,7 +6489,7 @@ Misc options
- start-dirty Only start the servers (without initialization) for
- the first specified test case
- user-args In combination with start* and no test name, drops
-- arguments to mysqld except those speficied with
-+ arguments to mysqld except those specified with
- --mysqld (if any)
- wait-all If --start or --start-dirty option is used, wait for all
- servers to exit before finishing the process
---- a/mysql-test/r/mysqld--help.result
-+++ b/mysql-test/r/mysqld--help.result
-@@ -613,7 +613,7 @@ The following options may be given as the first argument:
- --relay-log-space-limit=#
- Maximum space to use for all relay logs
- --replicate-annotate-row-events
-- Tells the slave to write annotate rows events recieved
-+ Tells the slave to write annotate rows events received
- from the master to its own binary log. Ignored if
- log_slave_updates is not set
- --replicate-do-db=name
---- a/mysql-test/r/ps.result
-+++ b/mysql-test/r/ps.result
-@@ -613,8 +613,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
- ("4", "1", "sup", "0");
- create table t3 (
- id int(11) not null default '0',
--preceeding_id int(11) not null default '0',
--primary key (id,preceeding_id)
-+preceding_id int(11) not null default '0',
-+primary key (id,preceding_id)
- );
- create table t4 (
- user_id varchar(50) not null,
-@@ -625,7 +625,7 @@ insert into t4 values("nicke", "imp");
- prepare stmt from
- 'select distinct t1.partner_id
- from t1 left join t3 on t1.id = t3.id
-- left join t1 pp on pp.id = t3.preceeding_id
-+ left join t1 pp on pp.id = t3.preceding_id
- where
- exists (
- select *
---- a/mysql-test/r/subselect_sj.result
-+++ b/mysql-test/r/subselect_sj.result
-@@ -1007,8 +1007,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
- ("4", "1", "sup", "0");
- create table t3 (
- id int(11) not null default '0',
--preceeding_id int(11) not null default '0',
--primary key (id,preceeding_id)
-+preceding_id int(11) not null default '0',
-+primary key (id,preceding_id)
- );
- create table t4 (
- user_id varchar(50) not null,
---- a/mysql-test/r/subselect_sj_jcl6.result
-+++ b/mysql-test/r/subselect_sj_jcl6.result
-@@ -1020,8 +1020,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
- ("4", "1", "sup", "0");
- create table t3 (
- id int(11) not null default '0',
--preceeding_id int(11) not null default '0',
--primary key (id,preceeding_id)
-+preceding_id int(11) not null default '0',
-+primary key (id,preceding_id)
- );
- create table t4 (
- user_id varchar(50) not null,
---- a/mysql-test/t/ps.test
-+++ b/mysql-test/t/ps.test
-@@ -677,8 +677,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
-
- create table t3 (
- id int(11) not null default '0',
-- preceeding_id int(11) not null default '0',
-- primary key (id,preceeding_id)
-+ preceding_id int(11) not null default '0',
-+ primary key (id,preceding_id)
- );
-
- create table t4 (
-@@ -692,7 +692,7 @@ insert into t4 values("nicke", "imp");
- prepare stmt from
- 'select distinct t1.partner_id
- from t1 left join t3 on t1.id = t3.id
-- left join t1 pp on pp.id = t3.preceeding_id
-+ left join t1 pp on pp.id = t3.preceding_id
- where
- exists (
- select *
---- a/mysql-test/t/subselect_sj.test
-+++ b/mysql-test/t/subselect_sj.test
-@@ -897,8 +897,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
- ("4", "1", "sup", "0");
- create table t3 (
- id int(11) not null default '0',
-- preceeding_id int(11) not null default '0',
-- primary key (id,preceeding_id)
-+ preceding_id int(11) not null default '0',
-+ primary key (id,preceding_id)
- );
-
- create table t4 (
---- a/sql/handler.h
-+++ b/sql/handler.h
-@@ -1270,7 +1270,7 @@ typedef struct st_ha_create_information
- For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current").
-
- Can be changed either explicitly by the parser.
-- If nothing speficied inherits the value of the original table (if present).
-+ If nothing specified inherits the value of the original table (if present).
- */
- enum row_type row_type;
- uint null_bits; /* NULL bits at start of record */
---- a/sql/log_event.h
-+++ b/sql/log_event.h
-@@ -1860,7 +1860,7 @@ public:
- bool is_valid() const { return query != 0; }
-
- /*
-- Returns number of bytes additionaly written to post header by derived
-+ Returns number of bytes additionally written to post header by derived
- events (so far it is only Execute_load_query event).
- */
- virtual ulong get_post_header_size_for_derived() { return 0; }
---- a/sql/password.c
-+++ b/sql/password.c
-@@ -425,7 +425,7 @@ void make_scrambled_password(char *to, const char *password)
-
- /*
- Produce an obscure octet sequence from password and random
-- string, recieved from the server. This sequence corresponds to the
-+ string, received from the server. This sequence corresponds to the
- password, but password can not be easily restored from it. The sequence
- is then sent to the server for validation. Trailing zero is not stored
- in the buf as it is not needed.
-@@ -467,7 +467,7 @@ scramble(char *to, const char *message, const char *password)
-
- /*
- Check that scrambled message corresponds to the password; the function
-- is used by server to check that recieved reply is authentic.
-+ is used by server to check that received reply is authentic.
- This function does not check lengths of given strings: message must be
- null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE
- long (if not, something fishy is going on).
---- a/sql/rpl_utility.cc
-+++ b/sql/rpl_utility.cc
-@@ -1157,7 +1157,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli)
- void Deferred_log_events::rewind()
- {
- /*
-- Reset preceeding Query log event events which execution was
-+ Reset preceding Query log event events which execution was
- deferred because of slave side filtering.
- */
- if (!is_empty())
---- a/sql/slave.cc
-+++ b/sql/slave.cc
-@@ -3524,7 +3524,7 @@ pthread_handler_t handle_slave_sql(void *arg)
- set_thd_in_use_temporary_tables(rli); // (re)set sql_thd in use for saved temp tables
- /*
- binlog_annotate_row_events must be TRUE only after an Annotate_rows event
-- has been recieved and only till the last corresponding rbr event has been
-+ has been received and only till the last corresponding rbr event has been
- applied. In all other cases it must be FALSE.
- */
- thd->variables.binlog_annotate_row_events= 0;
---- a/sql/sql_connect.cc
-+++ b/sql/sql_connect.cc
-@@ -704,7 +704,7 @@ static void update_global_user_stats_with_user(THD *thd,
- user_stats->cpu_time+= (thd->status_var.cpu_time -
- thd->org_status_var.cpu_time);
- /*
-- This is handle specially as bytes_recieved is incremented BEFORE
-+ This is handle specially as bytes_received is incremented BEFORE
- org_status_var is copied.
- */
- user_stats->bytes_received+= (thd->org_status_var.bytes_received-
---- a/sql/sql_prepare.cc
-+++ b/sql/sql_prepare.cc
-@@ -74,7 +74,7 @@ When one supplies long data for a placeholder:
-
- - Server gets the long data in pieces with command type
- 'COM_STMT_SEND_LONG_DATA'.
-- - The packet recieved will have the format as:
-+ - The packet received will have the format as:
- [COM_STMT_SEND_LONG_DATA:1][STMT_ID:4][parameter_number:2][data]
- - data from the packet is appended to the long data value buffer for this
- placeholder.
---- a/sql/sql_select.cc
-+++ b/sql/sql_select.cc
-@@ -20444,7 +20444,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
- Item *view_ref= NULL;
- /*
- If we have found field not by its alias in select list but by its
-- original field name, we should additionaly check if we have conflict
-+ original field name, we should additionally check if we have conflict
- for this name (in case if we would perform lookup in all tables).
- */
- if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&
-@@ -21467,7 +21467,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
- We are replacing the argument of Item_func_set_user_var after its value
- has been read. The argument's null_value should be set by now, so we
- must set it explicitly for the replacement argument since the null_value
-- may be read without any preceeding call to val_*().
-+ may be read without any preceding call to val_*().
- */
- new_field->update_null_value();
- List<Item> list;
---- a/sql/sys_vars.cc
-+++ b/sql/sys_vars.cc
-@@ -3817,7 +3817,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events(
- #ifdef HAVE_REPLICATION
- static Sys_var_mybool Sys_replicate_annotate_row_events(
- "replicate_annotate_row_events",
-- "Tells the slave to write annotate rows events recieved from the master "
-+ "Tells the slave to write annotate rows events received from the master "
- "to its own binary log. Ignored if log_slave_updates is not set",
- READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events),
- CMD_LINE(OPT_ARG), DEFAULT(0));
---- a/sql/tztime.cc
-+++ b/sql/tztime.cc
-@@ -2032,7 +2032,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
-
- /*
- At last we are doing the same thing for records in
-- mysql.time_zone_transition table. Here we additionaly need records
-+ mysql.time_zone_transition table. Here we additionally need records
- in ascending order by index scan also satisfies us.
- */
- table= tz_tables->table;
---- a/storage/maria/ma_rnext.c
-+++ b/storage/maria/ma_rnext.c
-@@ -71,7 +71,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
- Normally SQL layer would never request "search next" if
- "search first" failed. But HANDLER may do anything.
-
-- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
-+ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
- equals to mi_rfirst(), we must restore original state
- as if failing mi_rfirst() was not called.
- */
---- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp
-+++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
-@@ -63,7 +63,7 @@ class NdbEventOperationImpl;
- * - Event code does not check table schema version. Make sure to drop events
- * after table is dropped. Will be fixed in later
- * versions.
-- * - If a node failure has occured not all events will be recieved
-+ * - If a node failure has occured not all events will be received
- * anymore. Drop NdbEventOperation and Create again after nodes are up
- * again. Will be fixed in later versions.
- *
---- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
-+++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
-@@ -163,7 +163,7 @@ namespace NDB_CPC.telnetclient
- }
- else
- {
-- // If no data was recieved then the connection is probably dead
-+ // If no data was received then the connection is probably dead
- Console.WriteLine( "Disconnected", sock.RemoteEndPoint );
- sock.Shutdown( SocketShutdown.Both );
- sock.Close();
---- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
-+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
-@@ -10559,7 +10559,7 @@ void Dbtc::releaseAbortResources(Signal* signal)
-
- // MASV let state be CS_ABORTING until all
- // signals in the "air" have been received. Reset to CS_CONNECTED
-- // will be done when a TCKEYREQ with start flag is recieved
-+ // will be done when a TCKEYREQ with start flag is received
- // or releaseApiCon is called
- // apiConnectptr.p->apiConnectstate = CS_CONNECTED;
- apiConnectptr.p->apiConnectstate = CS_ABORTING;
---- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
-+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
-@@ -526,7 +526,7 @@ private:
- // we signal with a condition variable to the waiting
- // thread (receiveOptimisedResponse) that the signal has arrived.
- // Parameters:
-- // signal: The recieved signal
-+ // signal: The received signal
- // Returns: -
- //**************************************************************************
-
---- a/storage/ndb/test/ndbapi/testDict.cpp
-+++ b/storage/ndb/test/ndbapi/testDict.cpp
-@@ -942,7 +942,7 @@ int runStoreFrm(NDBT_Context* ctx, NDBT_Step* step){
-
- // Verfiy the frm data
- if (memcmp(pData, pData2, resultLen) != 0){
-- g_err << "Wrong data recieved" << endl;
-+ g_err << "Wrong data received" << endl;
- for (size_t i = 0; i < dataLen; i++){
- unsigned char c = ((unsigned char*)pData2)[i];
- g_err << hex << c << ", ";
---- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
-+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
-@@ -42,7 +42,7 @@ void ColAtt_DisplayError(SQLSMALLINT ColAtt_HandleType,
- * Test returning descriptor information
- *
- * Tests:
-- * -# Call SQLColAttribute, without preceeding SQLPrepare
-+ * -# Call SQLColAttribute, without preceding SQLPrepare
- * -# ???
- *
- * @return Zero, if test succeeded
---- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
-+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
-@@ -42,7 +42,7 @@ void ColAtt_DisplayErrorTest2(SQLSMALLINT ColAttTest2_HandleType,
- * Test returning descriptor information
- *
- * Test:
-- * -# Call SQLColAttribute without preceeding SQLExecute
-+ * -# Call SQLColAttribute without preceding SQLExecute
- * -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
- * -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
- * -# FieldIdentifer is not one of the code valuess in Table 20
---- a/storage/xtradb/fil/fil0fil.c
-+++ b/storage/xtradb/fil/fil0fil.c
-@@ -3946,7 +3946,7 @@ func_exit:
- page_no = dict_index_get_page(index);
- ut_a(page_no == 3);
-
-- fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionaly on buffer pool.\n");
-+ fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionally on buffer pool.\n");
-
- /* down to leaf */
- mtr_start(&mtr);
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
index 3add5c7..52e94d6 100644
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -3,7 +3,7 @@ Description: Remove upstream debian/* handling that is obsolete
--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200
+++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200
-@@ -455,12 +455,6 @@
+@@ -430,12 +430,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 cb88f05..0165f56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+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
@@ -6,5 +7,4 @@
61_replace_dash_with_bash_mbug675185.diff
75_man_syntax_fixes.diff
82_extend_default_test_timeout_for_tokudb.diff
-90_spelling.diff
99_remove_rename_mariadb-server_files_in.diff
diff --git a/debian/po/nl.po b/debian/po/nl.po
index a1b77e3..eaf3fa1 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,26 +1,26 @@
-# 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.
-#
+# 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.
+#
msgid ""
msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
+"Project-Id-Version: mariadb-5.5_5.5.39-2\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: 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"
+"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"
"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,24 +29,17 @@ 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 ""
-"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."
+"Zulk een bestand geeft aan dat er eerder een pakket mariadb-server met een "
+"hogere versie is geinstalleerd."
#. Type: boolean
#. Description
@@ -55,14 +48,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
@@ -71,6 +64,8 @@ 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
@@ -79,12 +74,14 @@ 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 ""
+msgstr "Wilt u alle MariaDB-databases verwijderen?"
#. Type: boolean
#. Description
@@ -93,93 +90,76 @@ 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 ""
-"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."
+"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."
#. 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 ""
-"Het wordt sterk aangeraden een wachtwoord in te stellen voor de "
-"administratieve MariaDB \"root\"-gebruiker."
+"Hoewel niet verplicht, wordt het 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 "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
+msgstr "Herhaal het 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 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."
+"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."
#. 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
@@ -188,24 +168,27 @@ 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 ""
+msgstr "Fout bij het invoeren van het wachtwoord"
#. 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 ""
+msgstr "De NDB-cluster lijkt in gebruik te zijn"
#. Type: error
#. Description
@@ -215,12 +198,15 @@ 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 ""
+msgstr "wilt u echt overschakelen op MariaDB?"
#. Type: boolean
#. Description
@@ -229,6 +215,8 @@ 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
@@ -238,82 +226,6 @@ msgid ""
"and thus migration back to MySQL might not always work, at least not as "
"automatically as migrating from MySQL to MariaDB."
msgstr ""
-
-#, 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)."
+"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."
diff --git a/debian/watch b/debian/watch
index 8ff7cb2..3ea2544 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,12 +1,7 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ \
-ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/mariadb-5.5.([\d\.]*).tar.gz \
-debian uupdate
-
-# Simplified watch file still does not work
-#$ uscan --no-download --verbose --debug
-#uscan debug: requesting URL ftp://ftp.ddg.lth.se/mariadb/
-# ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/ failed: 400 FTP return code 000
+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 \
+ 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.
--
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