Skip to content

M
MariaDB
Commit dace5f9a authored by Sergei Petrunia's avatar Sergei Petrunia
Browse files
Options

Merge branch '10.2' of github.com:MariaDB/server into 10.2

parents 951ca5dd ded4cd12
Expand all Show whitespace changes
Inline Side-by-side
Showing with 10160 additions and 3562 deletions
.travis.yml
View file @ dace5f9a
...@@ -21,6 +21,7 @@ addons: ...@@ -21,6 +21,7 @@ addons:
- debhelper - debhelper
- dh-apparmor - dh-apparmor
- dpatch - dpatch
- gdb
- libaio-dev - libaio-dev
- libboost-dev - libboost-dev
- libjudy-dev - libjudy-dev
......
CMakeLists.txt
View file @ dace5f9a
...@@ -162,7 +162,6 @@ INCLUDE(install_macros) ...@@ -162,7 +162,6 @@ INCLUDE(install_macros)
INCLUDE(systemd) INCLUDE(systemd)
INCLUDE(mysql_add_executable) INCLUDE(mysql_add_executable)
INCLUDE(crc32-vpmsum) INCLUDE(crc32-vpmsum)
INCLUDE(numa)
# Handle options # Handle options
OPTION(DISABLE_SHARED OPTION(DISABLE_SHARED
...@@ -435,12 +434,6 @@ CONFIGURE_FILE( ...@@ -435,12 +434,6 @@ CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
IF(DEB)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files.in
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.files)
ENDIF(DEB)
# Handle the "INFO_*" files. # Handle the "INFO_*" files.
INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake) INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
# Source: This can be done during the cmake phase, all information is # Source: This can be done during the cmake phase, all information is
......
client/mysql.cc
View file @ dace5f9a
...@@ -5129,7 +5129,7 @@ static const char *construct_prompt() ...@@ -5129,7 +5129,7 @@ static const char *construct_prompt()
{ {
const char *prompt; const char *prompt;
prompt= connected ? mysql_get_host_info(&mysql) : "not_connected"; prompt= connected ? mysql_get_host_info(&mysql) : "not_connected";
if (strstr(prompt, "Localhost")) if (strstr(prompt, "Localhost") || strstr(prompt, "localhost "))
{ {
if (*c == 'h') if (*c == 'h')
processed_prompt.append("localhost"); processed_prompt.append("localhost");
......
client/mysqlbinlog.cc
View file @ dace5f9a
...@@ -1002,6 +1002,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, ...@@ -1002,6 +1002,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
switch (ev_type) { switch (ev_type) {
case QUERY_EVENT: case QUERY_EVENT:
case QUERY_COMPRESSED_EVENT:
{ {
Query_log_event *qe= (Query_log_event*)ev; Query_log_event *qe= (Query_log_event*)ev;
if (!qe->is_trans_keyword()) if (!qe->is_trans_keyword())
...@@ -1243,6 +1244,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, ...@@ -1243,6 +1244,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
case WRITE_ROWS_EVENT_V1: case WRITE_ROWS_EVENT_V1:
case UPDATE_ROWS_EVENT_V1: case UPDATE_ROWS_EVENT_V1:
case DELETE_ROWS_EVENT_V1: case DELETE_ROWS_EVENT_V1:
case WRITE_ROWS_COMPRESSED_EVENT:
case DELETE_ROWS_COMPRESSED_EVENT:
case UPDATE_ROWS_COMPRESSED_EVENT:
case WRITE_ROWS_COMPRESSED_EVENT_V1:
case UPDATE_ROWS_COMPRESSED_EVENT_V1:
case DELETE_ROWS_COMPRESSED_EVENT_V1:
{ {
Rows_log_event *e= (Rows_log_event*) ev; Rows_log_event *e= (Rows_log_event*) ev;
if (print_row_event(print_event_info, ev, e->get_table_id(), if (print_row_event(print_event_info, ev, e->get_table_id(),
......
cmake/numa.cmake
View file @ dace5f9a
MACRO (MYSQL_CHECK_NUMA) MACRO (MYSQL_CHECK_NUMA)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
CHECK_INCLUDE_FILES(numa.h HAVE_NUMA_H) CHECK_INCLUDE_FILES(numa.h HAVE_NUMA_H)
CHECK_INCLUDE_FILES(numaif.h HAVE_NUMAIF_H) CHECK_INCLUDE_FILES(numaif.h HAVE_NUMAIF_H)
...@@ -24,15 +25,19 @@ MACRO (MYSQL_CHECK_NUMA) ...@@ -24,15 +25,19 @@ MACRO (MYSQL_CHECK_NUMA)
}" }"
HAVE_LIBNUMA) HAVE_LIBNUMA)
SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES}) SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
ELSE() IF(HAVE_LIBNUMA)
SET(HAVE_LIBNUMA 0) ADD_DEFINITIONS(-DHAVE_LIBNUMA=1)
SET(NUMA_LIBRARY "numa")
ENDIF()
ENDIF() ENDIF()
IF(WITH_NUMA AND NOT HAVE_LIBNUMA) IF(WITH_NUMA AND NOT HAVE_LIBNUMA)
# Forget it in cache, abort the build. # Forget it in cache, abort the build.
UNSET(WITH_NUMA CACHE) UNSET(WITH_NUMA CACHE)
UNSET(NUMA_LIBRARY CACHE)
MESSAGE(FATAL_ERROR "Could not find numa headers/libraries") MESSAGE(FATAL_ERROR "Could not find numa headers/libraries")
ENDIF() ENDIF()
ENDIF()
ENDMACRO() ENDMACRO()
cmake/systemd.cmake
View file @ dace5f9a
...@@ -56,12 +56,6 @@ MACRO(CHECK_SYSTEMD) ...@@ -56,12 +56,6 @@ MACRO(CHECK_SYSTEMD)
AND HAVE_SYSTEMD_SD_NOTIFY AND HAVE_SYSTEMD_SD_NOTIFYF) AND HAVE_SYSTEMD_SD_NOTIFY AND HAVE_SYSTEMD_SD_NOTIFYF)
ADD_DEFINITIONS(-DHAVE_SYSTEMD) ADD_DEFINITIONS(-DHAVE_SYSTEMD)
SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster galera_recovery) SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster galera_recovery)
SET(SYSTEMD_DEB_FILES "usr/bin/mariadb-service-convert
usr/bin/galera_new_cluster
usr/bin/galera_recovery
${INSTALL_SYSTEMD_UNITDIR}/mariadb.service
${INSTALL_SYSTEMD_UNITDIR}/mariadb@.service
${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d/use_galera_new_cluster.conf")
IF(DEB) IF(DEB)
SET(SYSTEMD_EXECSTARTPRE "ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld") SET(SYSTEMD_EXECSTARTPRE "ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld")
SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start") SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start")
......
config.h.cmake
View file @ dace5f9a
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
#cmakedefine HAVE_LIBWRAP 1 #cmakedefine HAVE_LIBWRAP 1
#cmakedefine HAVE_SYSTEMD 1 #cmakedefine HAVE_SYSTEMD 1
#cmakedefine HAVE_CRC32_VPMSUM 1 #cmakedefine HAVE_CRC32_VPMSUM 1
#cmakedefine HAVE_LIBNUMA 1
/* Does "struct timespec" have a "sec" and "nsec" field? */ /* Does "struct timespec" have a "sec" and "nsec" field? */
#cmakedefine HAVE_TIMESPEC_TS_SEC 1 #cmakedefine HAVE_TIMESPEC_TS_SEC 1
......
debian/additions/debian-start 100644 → 100755
View file @ dace5f9a
...@@ -7,13 +7,19 @@ ...@@ -7,13 +7,19 @@
source /usr/share/mysql/debian-start.inc.sh source /usr/share/mysql/debian-start.inc.sh
if [ -f /etc/default/mysql ]; then
. /etc/default/mysql
fi
MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf" MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf"
MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
MYCHECK_PARAMS="--all-databases --fast --silent" MYCHECK_PARAMS="--all-databases --fast --silent"
MYCHECK_RCPT="root" MYCHECK_RCPT="${MYCHECK_RCPT:-root}"
## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables.
# The following commands should be run when the server is up but in background # The following commands should be run when the server is up but in background
# where they do not block the server start and in one shell instance so that # where they do not block the server start and in one shell instance so that
...@@ -21,7 +27,6 @@ MYCHECK_RCPT="root" ...@@ -21,7 +27,6 @@ MYCHECK_RCPT="root"
# If you want to disable the check for crashed tables comment # If you want to disable the check for crashed tables comment
# "check_for_crashed_tables" out. # "check_for_crashed_tables" out.
# (There may be no output to stdout inside the background process!) # (There may be no output to stdout inside the background process!)
echo "Checking for corrupt, not cleanly closed and upgrade needing tables."
# Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade # Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade
# process in the middle. # process in the middle.
......
debian/additions/debian-start.inc.sh 100644 → 100755
View file @ dace5f9a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# This file is included by /etc/mysql/debian-start # This file is included by /etc/mysql/debian-start
# #
## Check all unclosed tables. ## Check MyISAM and Aria unclosed tables.
# - Requires the server to be up. # - Requires the server to be up.
# - Is supposed to run silently in background. # - Is supposed to run silently in background.
function check_for_crashed_tables() { function check_for_crashed_tables() {
...@@ -11,20 +11,27 @@ function check_for_crashed_tables() { ...@@ -11,20 +11,27 @@ function check_for_crashed_tables() {
set -u set -u
# But do it in the background to not stall the boot process. # But do it in the background to not stall the boot process.
logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables" logger -p daemon.info -i -t$0 "Triggering myisam-recover for all MyISAM tables and aria-recover for all Aria tables"
# Checking for $? is unreliable so the size of the output is checked. # Checking for $? is unreliable so the size of the output is checked.
# Some table handlers like HEAP do not support CHECK TABLE. # Some table handlers like HEAP do not support CHECK TABLE.
tempfile=`tempfile` tempfile=`tempfile`
# We have to use xargs in this case, because a for loop barfs on the # We have to use xargs in this case, because a for loop barfs on the
# spaces in the thing to be looped over. # spaces in the thing to be looped over.
# If a crashed table is encountered, the "mysql" command will return with a status different from 0
set +e
LC_ALL=C $MYSQL --skip-column-names --batch -e ' LC_ALL=C $MYSQL --skip-column-names --batch -e '
select concat('\''select count(*) into @discard from `'\'', select concat('\''select count(*) into @discard from `'\'',
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'') TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
from information_schema.TABLES where ENGINE='\''MyISAM'\' | \ from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
xargs -i $MYSQL --skip-column-names --silent --batch \ xargs -i $MYSQL --skip-column-names --silent --batch \
--force -e "{}" >$tempfile --force -e "{}" &>$tempfile
if [ -s $tempfile ]; then set -e
if [ -s "$tempfile" ]; then
( (
/bin/echo -e "\n" \ /bin/echo -e "\n" \
"Improperly closed tables are also reported if clients are accessing\n" \ "Improperly closed tables are also reported if clients are accessing\n" \
......
debian/additions/echo_stderr 100644 → 100755
View file @ dace5f9a
File mode changed from 100644 to 100755
debian/additions/mariadb.cnf
View file @ dace5f9a
...@@ -15,3 +15,5 @@ ...@@ -15,3 +15,5 @@
#collation-server = utf8_general_ci #collation-server = utf8_general_ci
#character_set_server = utf8 #character_set_server = utf8
#collation_server = utf8_general_ci #collation_server = utf8_general_ci
# Import all .cnf files from configuration directory
!includedir /etc/mysql/mariadb.conf.d/
debian/autobake-deb.sh
View file @ dace5f9a
#!/bin/bash #!/bin/bash
#
# Build MariaDB .deb packages. # Build MariaDB .deb packages for test and release at mariadb.org
# Based on OurDelta .deb packaging scripts, which are in turn based on Debian #
# MySQL packages.
# Exit immediately on any error # Exit immediately on any error
set -e set -e
# Debug script and command lines
#set -x
# On Buildbot, don't run the mysql-test-run test suite as part of build. # On Buildbot, 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 # It takes a lot of time, and we will do a better test anyway in
# Buildbot, running the test suite from installed .debs on a clean VM. # Buildbot, running the test suite from installed .debs on a clean VM.
...@@ -21,65 +17,85 @@ then ...@@ -21,65 +17,85 @@ then
export DEB_BUILD_OPTIONS="nocheck" export DEB_BUILD_OPTIONS="nocheck"
fi fi
export MARIADB_OPTIONAL_DEBS="" # Travis-CI optimizations
if [[ $TRAVIS ]]
# Find major.minor version. then
# # On Travis-CI, the log must stay under 4MB so make the build less verbose
source ./VERSION sed -i -e '/Add support for verbose builds/,+2d' debian/rules
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
RELEASE_EXTRA=""
RELEASE_NAME="" # Don't include test suite package on Travis-CI to make the build time shorter
PATCHLEVEL="+maria" sed '/Package: mariadb-test-data/,+26d' -i debian/control
LOGSTRING="MariaDB build" sed '/Package: mariadb-test/,+34d' -i debian/control
fi
# Look up distro-version specific stuff.
CODENAME="$(lsb_release -sc)" # Look up distro-version specific stuff
# Always keep the actual packaging as up-to-date as possible following the latest
# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh
# tests for backwards compatibility and strip away parts on older builders.
# Add libcrack2 (>= 2.9.0) as a build dependency if available in the distribution # If libcrack2 (>= 2.9.0) is not available (before Debian Jessie and Ubuntu Trusty)
# This matches Debian Jessie, Stretch and Ubuntu Trusty, Wily, Xenial, Yakkety # clean away the cracklib stanzas so the package can build without them.
# Update check when version 2.10 or newer is available. if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
if apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
then then
sed 's/Standards-Version/,libcrack2-dev (>= 2.9.0)\nStandards-Version/' debian/control sed '/libcrack2-dev/d' -i debian/control
cat <<EOT >> debian/control sed '/Package: mariadb-plugin-cracklib/,+10d' -i debian/control
Package: mariadb-cracklib-password-check-10.2
Architecture: any
Depends: libcrack2 (>= 2.9.0),
mariadb-server-10.2,
\${misc:Depends},
\${shlibs:Depends}
Description: CrackLib Password Validation Plugin for MariaDB
This password validation plugin uses cracklib to allow only
sufficiently secure (as defined by cracklib) user passwords in MariaDB.
EOT
fi fi
# Add libpcre3-dev (>= 2:8.35-3.2~) as a build dependency if available in the distribution # If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily)
# This matches Debian Jessie, Stretch and Ubuntu Wily, Xenial, Yakkety # clean away the PCRE3 stanzas so the package can build without them.
# Update check when version 2:8.40 or newer is available. # Update check when version 2:8.40 or newer is available.
if apt-cache madison libpcre3-dev | grep 'libpcre3-dev *| *2:8\.3[2-9]' >/dev/null 2>&1 if ! apt-cache madison libpcre3-dev | grep 'libpcre3-dev *| *2:8\.3[2-9]' >/dev/null 2>&1
then then
sed 's/Standards-Version/,libpcre3-dev (>= 2:8.35-3.2~)\nStandards-Version/' debian/control sed '/libpcre3-dev/d' -i debian/control
fi fi
# Adjust changelog, add new version. # If libsystemd-dev is not available (before Debian Jessie or Ubuntu Wily)
# # clean away the systemd stanzas so the package can build without them.
if ! apt-cache madison libsystemd-dev | grep 'libsystemd-dev' >/dev/null 2>&1
then
sed '/dh-systemd/d' -i debian/control
sed '/libsystemd-dev/d' -i debian/control
sed 's/ --with systemd//' -i debian/rules
sed '/systemd/d' -i debian/rules
sed '/\.service/d' -i debian/rules
sed '/galera_new_cluster/d' -i debian/mariadb-server-10.2.install
sed '/galera_recovery/d' -i debian/mariadb-server-10.2.install
sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.2.install
fi
# Adjust changelog, add new version
echo "Incrementing changelog and starting build scripts" echo "Incrementing changelog and starting build scripts"
dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." # Find major.minor version
source ./VERSION
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
PATCHLEVEL="+maria"
LOGSTRING="MariaDB build"
CODENAME="$(lsb_release -sc)"
dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}."
echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " echo "Creating package version ${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... "
# Build the package. # Build the package
# Pass -I so that .git and other unnecessary temporary and source control files # Pass -I so that .git and other unnecessary temporary and source control files
# will be ignored by dpkg-source when createing the tar.gz source package # will be ignored by dpkg-source when creating the tar.gz source package.
fakeroot dpkg-buildpackage -us -uc -I # Use -b to build binary only packages as there is no need to waste time on
# generating the source package.
fakeroot dpkg-buildpackage -us -uc -I -b
[ -e debian/autorm-file ] && rm -vf `cat debian/autorm-file` # Don't log package contents on Travis-CI to save time and log size
if [[ ! $TRAVIS ]]
then
echo "List package contents ..."
cd ..
for package in `ls *.deb`
do
echo $package | cut -d '_' -f 1
dpkg-deb -c $package | awk '{print $1 " " $2 " " $6}' | sort -k 3
echo "------------------------------------------------"
done
fi
echo "Build complete" echo "Build complete"
# end of autobake script
debian/control
View file @ dace5f9a
This diff is collapsed.
debian/libmariadbclient-dev.README.Maintainer
View file @ dace5f9a
The examples directory includes files that might be needed by some The examples directory includes files that might be needed by some
developers: developers:
- header files not installed by default
- the example file udf_example.c - the example file udf_example.c
debian/libmariadbclient-dev.files → debian/libmariadbclient-dev.install
View file @ dace5f9a
usr/bin/mysql_config usr/bin/mysql_config
usr/include/mysql
usr/include/mariadb usr/include/mariadb
usr/lib/mariadb/libmariadbclient.a usr/include/mysql/*
usr/lib/libmysqlservices.a usr/lib/*/libmariadb.so
usr/lib/*/libmariadbclient.a
usr/lib/*/libmysqlservices.a
usr/share/aclocal/mysql.m4 usr/share/aclocal/mysql.m4
usr/share/pkgconfig/mariadb.pc usr/share/pkgconfig/mariadb.pc
usr/share/man/man1/mysql_config.1
debian/libmariadbclient-dev.manpages 0 → 100644
View file @ dace5f9a
debian/tmp/usr/share/man/man1/mysql_config.1
debian/libmariadbclient18.files → debian/libmariadbclient18.install
View file @ dace5f9a
usr/lib/mariadb/libmariadb.so.* usr/lib/mariadb/libmariadb.so.*
usr/lib/mysql/plugin/mysql_clear_password.so
usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/mysql_clear_password.so
debian/libmariadbd-dev.files deleted 100644 → 0
View file @ 951ca5dd
usr/lib/mysql/*.a
usr/lib/mysql/*.la
debian/libmariadbd-dev.install 0 → 100644
View file @ dace5f9a
usr/lib/*/libmysqld.a
usr/lib/*/libmysqld.so
debian/libmariadbd18.install 0 → 100644
View file @ dace5f9a
usr/lib/*/libmysqld.so.18
debian/mariadb-client-10.2.README.Debian
View file @ dace5f9a
FAQ: FAQ:
Q: My <tab> completion is gone, why? Q: My <tab> completition is gone, why?
A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf! A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
debian/mariadb-client-10.2.dirs deleted 100644 → 0
View file @ 951ca5dd
usr/bin/
usr/share/man/man1/
usr/share/perl5/
debian/mariadb-client-10.2.files → debian/mariadb-client-10.2.install
View file @ dace5f9a
usr/bin/innochecksum debian/additions/innotop/innotop usr/bin/
usr/bin/innotop debian/additions/mysqlreport usr/bin/
usr/bin/mysql_find_rows
usr/bin/mysql_fix_extensions
usr/bin/mysql_waitpid
usr/bin/mysqlaccess usr/bin/mysqlaccess
usr/bin/mysqladmin usr/bin/mysqladmin
usr/bin/mysqldump usr/bin/mysqldump
usr/bin/mysqldumpslow usr/bin/mysqldumpslow
usr/bin/mysql_find_rows
usr/bin/mysql_fix_extensions
usr/bin/mysqlimport usr/bin/mysqlimport
usr/bin/mysqlreport
usr/bin/mysqlshow usr/bin/mysqlshow
usr/bin/mysqlslap usr/bin/mysqlslap
usr/bin/mysql_waitpid
usr/share/man/man1/innotop.1
usr/share/man/man1/mysqlaccess.1
usr/share/man/man1/mysqladmin.1
usr/share/man/man1/mysqldump.1
usr/share/man/man1/mysqldumpslow.1
usr/share/man/man1/mysql_find_rows.1
usr/share/man/man1/mysql_fix_extensions.1
usr/share/man/man1/mysqlimport.1
usr/share/man/man1/mysqlreport.1
usr/share/man/man1/mysqlshow.1
usr/share/man/man1/mysqlslap.1
usr/share/man/man1/mysql_waitpid.1
debian/mariadb-client-10.2.manpages 0 → 100644
View file @ dace5f9a
debian/additions/innotop/innotop.1
debian/tmp/usr/share/man/man1/mysqlaccess.1
debian/tmp/usr/share/man/man1/mysqladmin.1
debian/tmp/usr/share/man/man1/mysqldump.1
debian/tmp/usr/share/man/man1/mysqldumpslow.1
debian/tmp/usr/share/man/man1/mysql_find_rows.1
debian/tmp/usr/share/man/man1/mysql_fix_extensions.1
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/tmp/usr/share/man/man1/mysql_waitpid.1
debian/mariadb-client-10.2.menu
View file @ dace5f9a
# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ # According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
?package(innotop):needs="text" section="Applications/Data Management"\ ?package(mariadb-client-10.2):needs="text" section="Applications/Data Management"\
title="innotop" command="/usr/bin/innotop" title="Innotop" command="/usr/bin/innotop"
debian/mariadb-client-core-10.2.files → debian/mariadb-client-core-10.2.install
View file @ dace5f9a
usr/bin/mysql usr/bin/mysql
usr/bin/mysqlcheck usr/bin/mysqlcheck
usr/share/man/man1/mysql.1
usr/share/man/man1/mysqlcheck.1
debian/mariadb-client-core-10.2.manpages 0 → 100644
View file @ dace5f9a
debian/tmp/usr/share/man/man1/mysql.1
debian/tmp/usr/share/man/man1/mysqlcheck.1
debian/mariadb-common.dirs 0 → 100644
View file @ dace5f9a
etc/mysql/mariadb.conf.d/
debian/mariadb-common.files deleted 100644 → 0
View file @ 951ca5dd
etc/mysql/conf.d/mariadb.cnf
debian/mariadb-common.install 0 → 100644
View file @ dace5f9a
debian/additions/mariadb.cnf etc/mysql/conf.d
debian/mariadb-plugin-cassandra.install 0 → 100644
View file @ dace5f9a
etc/mysql/conf.d/cassandra.cnf etc/mysql/mariadb.conf.d
usr/lib/mysql/plugin/ha_cassandra.so
debian/mariadb-connect-engine-10.2.files → debian/mariadb-plugin-connect.install
View file @ dace5f9a
usr/lib/mysql/plugin/ha_connect.so
etc/mysql/conf.d/connect.cnf etc/mysql/conf.d/connect.cnf
usr/lib/mysql/plugin/ha_connect.so
debian/mariadb-plugin-mroonga.install 0 → 100644
View file @ dace5f9a
usr/lib/mysql/plugin/ha_mroonga.so
usr/share/mysql/mroonga/install.sql
usr/share/mysql/mroonga/uninstall.sql
debian/mariadb-plugin-mroonga.postinst 0 → 100644
View file @ dace5f9a
#!/bin/sh
set -e
# Install Mroonga
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
# Always exit with success instead of leaving dpkg in a broken state
#DEBHELPER#
debian/mariadb-plugin-mroonga.prerm 0 → 100644
View file @ dace5f9a
#!/bin/sh
set -e
# Install Mroonga
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
# Always exit with success instead of leaving dpkg in a broken state
#DEBHELPER#
debian/mariadb-oqgraph-engine-10.2.files → debian/mariadb-plugin-oqgraph.install
View file @ dace5f9a
etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/ha_oqgraph.so
debian/mariadb-plugin-spider.install 0 → 100644
View file @ dace5f9a
usr/lib/mysql/plugin/ha_spider.so
usr/share/mysql/install_spider.sql
debian/mariadb-plugin-spider.postinst 0 → 100644
View file @ dace5f9a
#!/bin/sh
set -e
# Install Spider
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/install_spider.sql || true
# Always exit with success instead of leaving dpkg in a broken state
#DEBHELPER#
debian/mariadb-plugin-tokudb.install 0 → 100644
View file @ dace5f9a
etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
usr/bin/tokuftdump
usr/lib/mysql/plugin/ha_tokudb.so
usr/share/doc/mariadb-server-10.2/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
debian/mariadb-server-10.2.config
View file @ dace5f9a
#!/bin/bash -e #!/bin/bash
set -e
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
CNF=/etc/mysql/my.cnf
# Beware that there are two ypwhich one of them needs the 2>/dev/null! # 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 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 mariadb-server-10.0/nis_warning || true
db_go db_go
fi fi
# only ask this question on fresh installs, during "reconfiguration" and when # only ask this question on fresh installs, during "reconfiguration" and when
# not upgrading from an existing 5.0 installation. # not upgrading from an existing 5.0 installation.
# there is also an additional check for empty root passwords in the # there is also an additional check for empty root passwords in the
......
debian/mariadb-server-10.2.dirs
View file @ dace5f9a
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-10.2
var/run/mysqld
var/lib/mysql-upgrade var/lib/mysql-upgrade
debian/mariadb-server-10.2.files.in → debian/mariadb-server-10.2.install
View file @ dace5f9a
usr/lib/mysql/plugin/auth_pam.so debian/additions/debian-start etc/mysql
usr/lib/mysql/plugin/auth_socket.so debian/additions/debian-start.inc.sh usr/share/mysql
usr/lib/mysql/plugin/file_key_management.so debian/additions/echo_stderr usr/share/mysql
usr/lib/mysql/plugin/ha_archive.so debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
usr/lib/mysql/plugin/ha_blackhole.so
usr/lib/mysql/plugin/ha_federated.so
usr/lib/mysql/plugin/ha_federatedx.so
usr/lib/mysql/plugin/ha_mroonga.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/locales.so
usr/lib/mysql/plugin/metadata_lock_info.so
usr/lib/mysql/plugin/query_cache_info.so
usr/lib/mysql/plugin/query_response_time.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/simple_password_check.so
usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/wsrep_info.so
usr/lib/mysql/plugin/user_variables.so
usr/lib/libhsclient.so.*
etc/apparmor.d/usr.sbin.mysqld etc/apparmor.d/usr.sbin.mysqld
usr/share/apport/package-hooks/source_mariadb-10.2.py usr/bin/aria_chk
etc/mysql/debian-start usr/bin/aria_dump_log
etc/mysql/conf.d/mysqld_safe_syslog.cnf usr/bin/aria_ftdump
usr/bin/aria_pack
usr/bin/aria_read_log
usr/bin/msql2mysql usr/bin/msql2mysql
usr/bin/my_print_defaults usr/bin/my_print_defaults
usr/bin/myisamchk
usr/bin/myisam_ftdump usr/bin/myisam_ftdump
usr/bin/myisamchk
usr/bin/myisamlog usr/bin/myisamlog
usr/bin/myisampack 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_convert_table_format
usr/bin/mysql_install_db usr/bin/mysql_install_db
usr/bin/mysql_plugin usr/bin/mysql_plugin
usr/bin/mysql_secure_installation usr/bin/mysql_secure_installation
usr/bin/mysql_setpermission usr/bin/mysql_setpermission
usr/bin/mysql_tzinfo_to_sql usr/bin/mysql_tzinfo_to_sql
usr/bin/mysql_upgrade
usr/bin/mysqlbinlog usr/bin/mysqlbinlog
usr/bin/mysqld_multi usr/bin/mysqld_multi
usr/bin/mysqld_safe usr/bin/mysqld_safe
...@@ -55,43 +33,37 @@ usr/bin/wsrep_sst_mysqldump ...@@ -55,43 +33,37 @@ usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup
usr/bin/wsrep_sst_xtrabackup-v2 usr/bin/wsrep_sst_xtrabackup-v2
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_socket.so
usr/lib/mysql/plugin/file_key_management.so
usr/lib/mysql/plugin/ha_archive.so
usr/lib/mysql/plugin/ha_blackhole.so
usr/lib/mysql/plugin/ha_federated.so
usr/lib/mysql/plugin/ha_federatedx.so
usr/lib/mysql/plugin/ha_sphinx.so
usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/locales.so
usr/lib/mysql/plugin/metadata_lock_info.so
usr/lib/mysql/plugin/query_cache_info.so
usr/lib/mysql/plugin/query_response_time.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/simple_password_check.so
usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/user_variables.so
usr/lib/mysql/plugin/wsrep_info.so
usr/share/apport/package-hooks/source_mariadb-10.2.py
usr/share/doc/mariadb-server-10.2/mysqld.sym.gz usr/share/doc/mariadb-server-10.2/mysqld.sym.gz
usr/share/doc/mariadb-server-10.2/INFO_SRC
usr/share/doc/mariadb-server-10.2/INFO_BIN
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/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/errmsg-utf8.txt
usr/share/mysql/fill_help_tables.sql usr/share/mysql/fill_help_tables.sql
usr/share/mysql/maria_add_gis_sp_bootstrap.sql usr/share/mysql/maria_add_gis_sp_bootstrap.sql
usr/share/mysql/mroonga/install.sql
usr/share/mysql/mroonga/uninstall.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_performance_tables.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_data_timezone.sql usr/share/mysql/mysql_test_data_timezone.sql
usr/share/mysql/wsrep_notify usr/share/mysql/wsrep_notify
@CASSANDRA_DEB_FILES@ usr/bin/galera_new_cluster
@SPIDER_DEB_FILES@ usr/bin/galera_recovery
@TOKUDB_DEB_FILES@ usr/bin/mariadb-service-convert
@SYSTEMD_DEB_FILES@ lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
debian/mariadb-server-10.2.manpages 0 → 100644
View file @ dace5f9a
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
debian/tmp/usr/share/man/man1/myisamlog.1
debian/tmp/usr/share/man/man1/myisampack.1
debian/tmp/usr/share/man/man1/my_print_defaults.1
debian/tmp/usr/share/man/man1/mysqlbinlog.1
debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
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/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/mariadb-server-10.2.mysql-server.logrotate
View file @ dace5f9a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# flush-logs'd only once. # flush-logs'd only once.
# Else the binary logs would automatically increase by n times every day. # Else the binary logs would automatically increase by n times every day.
# - The error log is obsolete, messages go to syslog now. # - The error log is obsolete, messages go to syslog now.
/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log { /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log {
daily daily
rotate 7 rotate 7
missingok missingok
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
sharedscripts sharedscripts
postrotate postrotate
test -x /usr/bin/mysqladmin || exit 0 test -x /usr/bin/mysqladmin || exit 0
if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
# If this fails, check debian.conf! # If this fails, check debian.conf!
mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs
......
debian/mariadb-server-10.2.mysql.default 0 → 100644
View file @ dace5f9a
# The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script.
# If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog.
# Default: 30
#MYSQLD_STARTUP_TIMEOUT=30
# The email recipient(s) of the output of the check for crashed and improperly closed MyISAM and Aria tables done at each server start by the "/etc/mysql/debian-start" script.
# Default: root
#MYCHECK_RCPT="root"
debian/mariadb-server-10.2.mysql.init
View file @ dace5f9a
...@@ -22,12 +22,16 @@ test -x /usr/sbin/mysqld || exit 0 ...@@ -22,12 +22,16 @@ test -x /usr/sbin/mysqld || exit 0
. /lib/lsb/init-functions . /lib/lsb/init-functions
SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
CONF=/etc/mysql/my.cnf
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
# priority can be overridden and "-s" adds output to stderr # priority can be overriden and "-s" adds output to stderr
ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
if [ -f /etc/default/mysql ]; then
. /etc/default/mysql
fi
# Safeguard (relative paths, core dumps..) # Safeguard (relative paths, core dumps..)
cd / cd /
umask 077 umask 077
...@@ -37,9 +41,6 @@ umask 077 ...@@ -37,9 +41,6 @@ umask 077
# so break my scripts. # so break my scripts.
export HOME=/etc/mysql/ export HOME=/etc/mysql/
# Source default config file.
[ -r /etc/default/mariadb ] && . /etc/default/mariadb
## Fetch a particular option from mysql's invocation. ## Fetch a particular option from mysql's invocation.
# #
# Usage: void mysqld_get_param option # Usage: void mysqld_get_param option
...@@ -97,6 +98,7 @@ mysqld_status () { ...@@ -97,6 +98,7 @@ mysqld_status () {
# #
case "${1:-''}" in case "${1:-''}" in
'start') 'start')
sanity_checks; sanity_checks;
# Start daemon # Start daemon
...@@ -109,10 +111,9 @@ case "${1:-''}" in ...@@ -109,10 +111,9 @@ case "${1:-''}" in
test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
# Start MariaDB! # Start MariaDB!
/usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
# 6s was reported in #352070 to be too little for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-60}"); do
sleep 1 sleep 1
if mysqld_status check_alive nowarn ; then break; fi if mysqld_status check_alive nowarn ; then break; fi
log_progress_msg "." log_progress_msg "."
...@@ -121,7 +122,9 @@ case "${1:-''}" in ...@@ -121,7 +122,9 @@ case "${1:-''}" in
log_end_msg 0 log_end_msg 0
# Now start mysqlcheck or whatever the admin wants. # Now start mysqlcheck or whatever the admin wants.
output=$(/etc/mysql/debian-start) output=$(/etc/mysql/debian-start)
[ -n "$output" ] && log_action_msg "$output" if [ -n "$output" ]; then
log_action_msg "$output"
fi
else else
log_end_msg 1 log_end_msg 1
log_failure_msg "Please take a look at the syslog" log_failure_msg "Please take a look at the syslog"
...@@ -164,7 +167,8 @@ case "${1:-''}" in ...@@ -164,7 +167,8 @@ case "${1:-''}" in
'restart') 'restart')
set +e; $SELF stop; set -e set +e; $SELF stop; set -e
$SELF start shift
$SELF start "${@}"
;; ;;
'reload'|'force-reload') 'reload'|'force-reload')
...@@ -182,16 +186,8 @@ case "${1:-''}" in ...@@ -182,16 +186,8 @@ case "${1:-''}" in
fi fi
;; ;;
'bootstrap')
# Bootstrap the cluster, start the first node
# that initiates the cluster
log_daemon_msg "Bootstrapping the cluster" "mysqld"
$SELF start "${@:2}" --wsrep-new-cluster
;;
*) *)
echo "Usage: $SELF start|stop|restart|reload|force-reload|status|bootstrap" echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
exit 1 exit 1
;; ;;
esac esac
debian/mariadb-server-10.2.postinst
View file @ dace5f9a
...@@ -58,19 +58,24 @@ set +e; invoke stop; set -e ...@@ -58,19 +58,24 @@ set +e; invoke stop; set -e
case "$1" in case "$1" in
configure) configure)
mysql_datadir=/usr/share/mysql mysql_statedir=/usr/share/mysql
mysql_statedir=/var/lib/mysql mysql_datadir=/var/lib/mysql
mysql_logdir=/var/log/mysql
mysql_rundir=/var/run/mysqld mysql_rundir=/var/run/mysqld
mysql_logdir=/var/log
mysql_cfgdir=/etc/mysql mysql_cfgdir=/etc/mysql
mysql_newlogdir=/var/log/mysql
mysql_upgradedir=/var/lib/mysql-upgrade mysql_upgradedir=/var/lib/mysql-upgrade
# first things first, if the following symlink exists, it is a preserved # If the following symlink exists, it is a preserved copy the old data dir
# copy the old data dir from a mysql upgrade that would have otherwise # created by the preinst script during a upgrade that would have otherwise
# been replaced by an empty mysql dir. this should restore it. # been replaced by an empty mysql dir. This should restore it.
for dir in DATADIR LOGDIR; do for dir in DATADIR LOGDIR; do
if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi
if [ "$dir" = "DATADIR" ]; then
targetdir=$mysql_datadir
else
targetdir=$mysql_logdir
fi
savelink="$mysql_upgradedir/$dir.link" savelink="$mysql_upgradedir/$dir.link"
if [ -L "$savelink" ]; then if [ -L "$savelink" ]; then
# If the targetdir was a symlink before we upgraded it is supposed # If the targetdir was a symlink before we upgraded it is supposed
...@@ -86,13 +91,13 @@ case "$1" in ...@@ -86,13 +91,13 @@ case "$1" in
mv "$targetdir" "$mysql_tmp" mv "$targetdir" "$mysql_tmp"
cat << EOF > "$mysql_tmp/README" cat << EOF > "$mysql_tmp/README"
if you're reading this, it's most likely because you had replaced /var/lib/mysql Ff you're reading this, it's most likely because you had replaced /var/lib/mysql
with a symlink, then upgraded to a new version of mysql, and then dpkg with a symlink, then upgraded to a new version of mysql, and then dpkg
removed your symlink (see #182747 and others). the mysql packages noticed removed your symlink (see #182747 and others). The mysql packages noticed
that this happened, and as a workaround have restored it. however, because 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 /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're going 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 and this is not a symlink to your database, you should be able to blow
this all away. this all away.
...@@ -100,38 +105,45 @@ EOF ...@@ -100,38 +105,45 @@ EOF
fi fi
fi fi
rmdir $mysql_upgradedir 2>/dev/null || true rmdir $mysql_upgradedir 2>/dev/null || true
done done
# Ensure the existence and right permissions for the database and # Ensure the existence and right permissions for the database and
# log files. # log files.
if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi
# Debian: beware of the bashisms... if [ ! -d "$mysql_datadir" -a ! -L "$mysql_datadir" ]; then mkdir "$mysql_datadir" ; fi
/bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER if [ ! -d "$mysql_logdir" -a ! -L "$mysql_logdir" ]; then mkdir "$mysql_logdir" ; fi
fi
if [ ! -d "$mysql_newlogdir" -a ! -L "$mysql_newlogdir" ]; then mkdir "$mysql_newlogdir"; fi
# When creating an ext3 jounal on an already mounted filesystem like e.g. # When creating an ext3 jounal on an already mounted filesystem like e.g.
# /var/lib/mysql, you get a .journal file that is not modifyable by chown. # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
# The mysql_datadir must not be writable by the mysql user under any # The mysql_statedir must not be writable by the mysql user under any
# circumstances as it contains scripts that are executed by root. # circumstances as it contains scripts that are executed by root.
set +e set +e
chown -R 0:0 $mysql_datadir chown -R 0:0 $mysql_statedir
chown -R mysql $mysql_statedir chown -R mysql $mysql_datadir
chown -R mysql $mysql_rundir chown -R mysql:adm $mysql_logdir
chown -R mysql:adm $mysql_newlogdir; chmod 2750 $mysql_newlogdir; chmod 2750 $mysql_logdir
for i in log err; do
touch $mysql_logdir/mysql.$i
chown mysql:adm $mysql_logdir/mysql.$i
chmod 0640 $mysql_logdir/mysql.$i
done
set -e set -e
# This is important to avoid dataloss when there is a removed # This is important to avoid dataloss when there is a removed
# mysql-server version from Woody lying around which used the same # mysql-server version from Woody lying around which used the same
# data directory and then somewhen gets purged by the admin. # data directory and then somewhen gets purged by the admin.
db_set mysql-server/postrm_remove_database false || true db_set mariadb-server/postrm_remove_database false || true
# Clean up old flags before setting new one
rm -f $mysql_datadir/debian-*.flag
# Flag data dir to avoid downgrades
touch $mysql_datadir/debian-10.2.flag
# initiate databases. Output is not allowed by debconf :-(
# 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
set +e
bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
set -e
# To avoid downgrades.
touch $mysql_statedir/debian-10.2.flag
## On every reconfiguration the maintenance user is recreated. ## On every reconfiguration the maintenance user is recreated.
# #
......
debian/mariadb-server-10.2.postrm
View file @ dace5f9a
#!/bin/bash -e #!/bin/bash -e
# It is possible that Debconf has already been removed, too. . /usr/share/debconf/confmodule
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
...@@ -52,35 +49,30 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the ...@@ -52,35 +49,30 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz} rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
rm -rf /var/log/mysql rm -rf /var/log/mysql
db_input high mysql-server-5.1/postrm_remove_databases || true db_input high mariadb-server-10.2/postrm_remove_databases || true
db_go || true db_go || true
db_get mysql-server-5.1/postrm_remove_databases || true db_get mariadb-server-10.2/postrm_remove_databases || true
if [ "$RET" = "true" ]; then if [ "$RET" = "true" ]; then
# never remove the debian.cnf when the databases are still existing # never remove the debian.cnf when the databases are still existing
# else we ran into big trouble on the next install! # else we ran into big trouble on the next install!
rm -f /etc/mysql/debian.cnf rm -f /etc/mysql/debian.cnf
rm -rf /var/lib/mysql # Remove all contents from /var/lib/mysql except if it's a
rm -rf /var/run/mysqld # directory with file system data. See #829491 for details and
# #608938 for potential mysql-server leftovers which erroneously
# had been renamed.
find /var/lib/mysql -mindepth 1 \
-not -path '*/lost+found/*' -not -name 'lost+found' \
-not -path '*/lost@002bfound/*' -not -name 'lost@002bfound' \
-delete
# "|| true" still needed as rmdir still exits with non-zero if
# /var/lib/mysql is a mount point
rmdir --ignore-fail-on-non-empty /var/lib/mysql || true
rm -rf /var/run/mysqld # this directory is created by the init script, don't leave behind
userdel mysql || true userdel mysql || true
fi 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 fi
# (normally) Automatically added by dh_installdebconf #DEBHELPER#
if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
db_purge
fi
# (normally) End automatically added section
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
exit 0 exit 0
debian/mariadb-server-10.2.preinst
View file @ dace5f9a
...@@ -14,9 +14,8 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } ...@@ -14,9 +14,8 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
DATADIR=/var/lib/mysql mysql_datadir=/var/lib/mysql
LOGDIR=/var/log/mysql mysql_upgradedir=/var/lib/mysql-upgrade
UPGRADEDIR=/var/lib/mysql-upgrade
# Try to stop the server in a sane way. If it does not success let the admin # Try to stop the server in a sane way. If it does not success let the admin
# do it himself. No database directories should be removed while the server # do it himself. No database directories should be removed while the server
...@@ -47,31 +46,80 @@ stop_server() { ...@@ -47,31 +46,80 @@ stop_server() {
################################ main() ########################## ################################ main() ##########################
this_version=10.2 this_version=10.2
max_upgradeable_version=5.6
# Check if a flag file is found that indicates a previous MariaDB or MySQL
# version was installed. If multiple flags are found, check which one was
# the biggest version number.
for flag in $mysql_datadir/debian-*.flag
do
# The for loop leaves $flag as the query string if there are no results,
# so the check below is needed to stop further processing when there are
# no real results.
if [ $flag = "$mysql_datadir/debian-*.flag" ]
then
break
fi
flag_version=`echo $flag | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
# Safe the user from stupidities. # Initialize value if empty
show_downgrade_warning=0 if [ -z "$found_version" ]
for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do then
found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'` found_version=$flag_version
if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
show_downgrade_warning=1
break;
fi fi
# Update value if now bigger then before
if dpkg --compare-versions "$flag_version" '>>' "$found_version"
then
found_version=$flag_version
fi
done 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 # If an upgrade is detected, proceed with it automatically without
db_go # requiring any user interaction.
db_get mariadb-server-$this_version/really_downgrade || true #
if [ "$RET" = "true" ]; then # However, if the user attempts to downgrade, warn about the incompatibility.
rm -f $DATADIR/debian-*.flag # Downgrade is detected if the flag version is bigger than $this_version
touch $DATADIR/debian-$this_version.flag # (e.g. 10.1 > 10.0) or the flag version is smaller than 10.0 but bigger
else # than $max_upgradeable_version.
echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2 if [ ! -z "$found_version" ]
echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2 then
echo "$DATADIR/debian-*.flag and try installing again." 1>&2
db_stop echo "$mysql_datadir: found previous version $found_version"
exit 1
if dpkg --compare-versions "$found_version" '>>' "$this_version"
then
downgrade_detected=true
fi fi
if dpkg --compare-versions "$found_version" '>>' "$max_upgradeable_version" \
&& dpkg --compare-versions "$found_version" '<<' "10.0"
then
downgrade_detected=true
fi
fi
# Don't abort dpkg if downgrade is detected (as was done previously).
# Instead simply move the old datadir and create a new for this_version.
if [ ! -z "$downgrade_detected" ]
then
db_input critical mariadb-server-10.2/old_data_directory_saved || true
db_go
echo "The file $mysql_datadir/debian-$found_version.flag indicates a" 1>&2
echo "version that cannot automatically be upgraded. Therefore the" 1>&2
echo "previous data directory will be renamed to $mysql_datadir-$found_version and" 1>&2
echo "a new data directory will be initialized at $mysql_datadir." 1>&2
echo "Please manually export/import your data (e.g. with mysqldump) if needed." 1>&2
mv -f $mysql_datadir $mysql_datadir-$found_version
# Also move away the old debian.cnf file that included credentials that are
# no longer valid
mv -f /etc/mysql/debian.cnf /etc/mysql/debian.cnf-$found_version
fi fi
# to be sure # to be sure
...@@ -86,7 +134,7 @@ fi ...@@ -86,7 +134,7 @@ fi
# #
# Now we have to ensure the following state: # Now we have to ensure the following state:
# /etc/passwd: mysql:x:100:101:MySQL Server:/var/lib/mysql:/bin/false # /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
# /etc/group: mysql:x:101: # /etc/group: mysql:x:101:
# #
# Sadly there could any state be present on the system so we have to # Sadly there could any state be present on the system so we have to
...@@ -107,7 +155,8 @@ if ! getent passwd mysql >/dev/null; then ...@@ -107,7 +155,8 @@ if ! getent passwd mysql >/dev/null; then
--system \ --system \
--disabled-login \ --disabled-login \
--ingroup mysql \ --ingroup mysql \
--home $DATADIR \ --no-create-home \
--home /nonexistent \
--gecos "MySQL Server" \ --gecos "MySQL Server" \
--shell /bin/false \ --shell /bin/false \
mysql >/dev/null mysql >/dev/null
...@@ -121,19 +170,19 @@ set -e ...@@ -121,19 +170,19 @@ set -e
for dir in DATADIR LOGDIR; do for dir in DATADIR LOGDIR; do
checkdir=`eval echo "$"$dir` checkdir=`eval echo "$"$dir`
if [ -L "$checkdir" ]; then if [ -L "$checkdir" ]; then
mkdir -p "$UPGRADEDIR" mkdir -p "$mysql_upgradedir"
cp -d "$checkdir" "$UPGRADEDIR/$dir.link" cp -dT "$checkdir" "$mysql_upgradedir/$dir.link"
fi fi
done done
# creating mysql home directory # creating mysql home directory
if [ ! -d $DATADIR -a ! -L $DATADIR ]; then if [ ! -d $mysql_datadir -a ! -L $mysql_datadir ]; then
mkdir $DATADIR mkdir $mysql_datadir
fi fi
# checking disc space # checking disc space
if LC_ALL=C BLOCKSIZE= df --portability $DATADIR/. | tail -n 1 | awk '{ exit ($4>1000) }'; then if LC_ALL=C BLOCKSIZE= df --portability $mysql_datadir/. | tail -n 1 | awk '{ exit ($4>1000) }'; then
echo "ERROR: There's not enough space in $DATADIR/" 1>&2 echo "ERROR: There's not enough space in $mysql_datadir/" 1>&2
db_stop db_stop
exit 1 exit 1
fi fi
...@@ -146,22 +195,11 @@ fi ...@@ -146,22 +195,11 @@ fi
# The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is # The "set +e" is necessary as e.g. a ".journal" of a ext3 partition is
# not chgrp'able (#318435). # not chgrp'able (#318435).
set +e set +e
chown mysql:mysql $DATADIR chown mysql:mysql $mysql_datadir
find $DATADIR -follow -not -group mysql -print0 2>/dev/null \ find $mysql_datadir -follow -not -group mysql -print0 2>/dev/null \
| xargs -0 --no-run-if-empty chgrp mysql | xargs -0 --no-run-if-empty chgrp mysql
set -e set -e
# Some files below /etc/ were possibly in the mysql-server-5.0/etch package
# before. They get overwritten by current ones to avoid unnecessary dpkg questions.
while read md5 file; do
if [ "`md5sum $file 2>/dev/null`" = "$md5 $file" ]; then
cp /usr/share/mysql-common/internal-use-only/`echo $file | sed 's/_g'` $file
fi
done <<EOT
6691f2fdc5c6d27ff0260eb79813e1bc /etc/init.d/mysql
b53b9552d44661361d39157c3c7c51d3 /etc/logrotate.d/mysql-server
57f3e58f72582ca55100dc1ba0f1a8ae /etc/mysql/debian-start
EOT
db_stop db_stop
......
debian/mariadb-server-10.2.prerm
View file @ dace5f9a
#!/bin/bash -e #!/bin/bash
set -e
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
......
debian/mariadb-server-10.2.templates
View file @ dace5f9a
...@@ -7,19 +7,19 @@ ...@@ -7,19 +7,19 @@
# Even minor modifications require translation updates and such # Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers. # changes should be coordinated with translators and reviewers.
Template: mariadb-server-10.2/really_downgrade Template: mariadb-server-10.2/old_data_directory_saved
Type: boolean Type: note
Default: false _Description: The old data directory will be saved at new location
_Description: Really proceed with downgrade?
A file named /var/lib/mysql/debian-*.flag exists on this system. A file named /var/lib/mysql/debian-*.flag exists on this system.
The number indicates a database binary format version that cannot automatically
be upgraded (or downgraded).
. .
Such a file is an indication that a mariadb-server package with a higher Therefore the previous data directory will be renamed to /var/lib/mysql-* and
version has been installed previously. a new data directory will be initialized at /var/lib/mysql.
. .
There is no guarantee that the version you're currently installing Please manually export/import your data (e.g. with mysqldump) if needed.
will be able to use the current databases.
Template: mysql-server-5.1/nis_warning Template: mariadb-server-10.2/nis_warning
Type: note Type: note
#flag:translate!:3,5 #flag:translate!:3,5
_Description: Important note for NIS/YP users _Description: Important note for NIS/YP users
...@@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users ...@@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users
. .
/var/lib/mysql: drwxr-xr-x mysql mysql /var/lib/mysql: drwxr-xr-x mysql mysql
Template: mysql-server-5.1/postrm_remove_databases Template: mariadb-server-10.2/postrm_remove_databases
Type: boolean Type: boolean
Default: false Default: false
_Description: Remove all MariaDB databases? _Description: Remove all MariaDB databases?
...@@ -44,13 +44,6 @@ _Description: Remove all MariaDB databases? ...@@ -44,13 +44,6 @@ _Description: Remove all MariaDB databases?
recent version or if a different mariadb-server package is already recent version or if a different mariadb-server package is already
using it, the data should be kept. using it, the data should be kept.
Template: mysql-server-5.1/start_on_boot
Type: boolean
Default: true
_Description: Start the MariaDB server on boot?
The MariaDB server can be launched automatically at boot time or manually
with the '/etc/init.d/mysql start' command.
Template: mysql-server/root_password Template: mysql-server/root_password
Type: password Type: password
_Description: New password for the MariaDB "root" user: _Description: New password for the MariaDB "root" user:
......
debian/mariadb-server-core-10.2.files → debian/mariadb-server-core-10.2.install
View file @ dace5f9a
usr/bin/innochecksum
usr/bin/mysql_upgrade
usr/sbin/mysqld usr/sbin/mysqld
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets usr/share/mysql/charsets
usr/share/mysql/czech usr/share/mysql/czech
usr/share/mysql/danish usr/share/mysql/danish
......
debian/mariadb-server-core-10.2.manpages 0 → 100644
View file @ dace5f9a
debian/tmp/usr/share/man/man8/mysqld.8
debian/tmp/usr/share/man/man1/innochecksum.1
debian/tmp/usr/share/man/man1/mysql_upgrade.1
debian/mariadb-test-10.2.dirs deleted 100644 → 0
View file @ 951ca5dd
usr/bin
usr/share/man/man1
usr/share/mysql/mysql-test
usr/share/mysql/mysql-test/extra
usr/share/mysql/mysql-test/extra/binlog_tests
usr/share/mysql/mysql-test/extra/rpl_tests
usr/share/mysql/mysql-test/lib
usr/share/mysql/mysql-test/lib/My
usr/share/mysql/mysql-test/lib/My/SafeProcess
usr/share/mysql/mysql-test/lib/My/File
usr/share/mysql/mysql-test/lib/v1
usr/share/mysql/mysql-test/lib/v1/My
usr/share/mysql/mysql-test/collections
usr/share/mysql/mysql-test/t
usr/share/mysql/mysql-test/r
usr/share/mysql/mysql-test/include
usr/share/mysql/mysql-test/suite
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/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
usr/share/mysql/mysql-test/suite/rpl/include
usr/share/mysql/mysql-test/suite/innodb
usr/share/mysql/mysql-test/suite/innodb/t
usr/share/mysql/mysql-test/suite/innodb/r
usr/share/mysql/mysql-test/suite/innodb/include
usr/share/mysql/mysql-test/suite/manual
usr/share/mysql/mysql-test/suite/manual/t
usr/share/mysql/mysql-test/suite/manual/r
usr/share/mysql/mysql-test/suite/stress
usr/share/mysql/mysql-test/suite/stress/t
usr/share/mysql/mysql-test/suite/stress/r
usr/share/mysql/mysql-test/suite/stress/include
usr/share/mysql/mysql-test/suite/jp
usr/share/mysql/mysql-test/suite/jp/t
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/maria
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
usr/share/mysql/mysql-test/suite/funcs_2/charset
usr/share/mysql/mysql-test/suite/funcs_2/r
usr/share/mysql/mysql-test/suite/funcs_2/include
usr/share/mysql/mysql-test/suite/funcs_2/data
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/federated
usr/share/mysql/mysql-test/suite/funcs_1
usr/share/mysql/mysql-test/suite/funcs_1/cursors
usr/share/mysql/mysql-test/suite/funcs_1/bitdata
usr/share/mysql/mysql-test/suite/funcs_1/views
usr/share/mysql/mysql-test/suite/funcs_1/storedproc
usr/share/mysql/mysql-test/suite/funcs_1/triggers
usr/share/mysql/mysql-test/suite/funcs_1/lib
usr/share/mysql/mysql-test/suite/funcs_1/t
usr/share/mysql/mysql-test/suite/funcs_1/r
usr/share/mysql/mysql-test/suite/funcs_1/include
usr/share/mysql/mysql-test/suite/funcs_1/datadict
usr/share/mysql/mysql-test/suite/vcol
usr/share/mysql/mysql-test/suite/vcol/inc
usr/share/mysql/mysql-test/suite/vcol/t
usr/share/mysql/mysql-test/suite/vcol/r
usr/share/mysql/mysql-test/suite/oqgraph
usr/share/mysql/mysql-test/suite/oqgraph/t
usr/share/mysql/mysql-test/suite/oqgraph/r
usr/share/mysql/mysql-test/suite/oqgraph/include
usr/share/mysql/mysql-test/std_data
usr/share/mysql/mysql-test/std_data/parts
usr/share/mysql/mysql-test/std_data/funcs_1
debian/mariadb-test-data.install 0 → 100644
View file @ dace5f9a
usr/share/mysql/mysql-test/collections
usr/share/mysql/mysql-test/extra
usr/share/mysql/mysql-test/include
usr/share/mysql/mysql-test/plugin
usr/share/mysql/mysql-test/r
usr/share/mysql/mysql-test/std_data
usr/share/mysql/mysql-test/suite
usr/share/mysql/mysql-test/t
usr/share/mysql/mysql-test/unstable-tests
debian/mariadb-test-10.2.files → debian/mariadb-test.install
View file @ dace5f9a
usr/bin/mysql_client_test
usr/bin/mysql_client_test_embedded
usr/bin/mysqltest
usr/bin/mysqltest_embedded
usr/lib/mysql/plugin/adt_null.so
usr/lib/mysql/plugin/auth_0x0100.so
usr/lib/mysql/plugin/auth_test_plugin.so
usr/lib/mysql/plugin/daemon_example.ini
usr/lib/mysql/plugin/debug_key_management.so usr/lib/mysql/plugin/debug_key_management.so
usr/lib/mysql/plugin/example_key_management.so
usr/lib/mysql/plugin/dialog_examples.so usr/lib/mysql/plugin/dialog_examples.so
usr/lib/mysql/plugin/auth_test_plugin.so usr/lib/mysql/plugin/example_key_management.so
usr/lib/mysql/plugin/qa_auth_interface.so
usr/lib/mysql/plugin/qa_auth_server.so
usr/lib/mysql/plugin/qa_auth_client.so
usr/lib/mysql/plugin/auth_0x0100.so
usr/lib/mysql/plugin/mypluglib.so
usr/lib/mysql/plugin/ha_test_sql_discovery.so
usr/lib/mysql/plugin/ha_example.so usr/lib/mysql/plugin/ha_example.so
usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/ha_test_sql_discovery.so
usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/libdaemon_example.so
usr/lib/mysql/plugin/adt_null.so usr/lib/mysql/plugin/mypluglib.so
usr/bin/mysql_client_test usr/lib/mysql/plugin/qa_auth_client.so
usr/bin/mysql_client_test_embedded usr/lib/mysql/plugin/qa_auth_interface.so
usr/bin/mysqltest_embedded usr/lib/mysql/plugin/qa_auth_server.so
usr/share/man/man1/mysql_client_test.1 usr/share/mysql/mysql-test/README
usr/share/man/man1/mysql_client_test_embedded.1 usr/share/mysql/mysql-test/README.gcov
usr/bin/mysqltest usr/share/mysql/mysql-test/README.stress
usr/share/man/man1/mysqltest.1 usr/share/mysql/mysql-test/disabled.def
usr/share/man/man1/mysqltest_embedded.1 usr/share/mysql/mysql-test/lib
usr/share/mysql/mysql-test usr/share/mysql/mysql-test/mysql-stress-test.pl
usr/share/mysql/mysql-test/mysql-test-run.pl
usr/share/mysql/mysql-test/purify.supp
usr/share/mysql/mysql-test/suite.pm
usr/share/mysql/mysql-test/valgrind.supp
debian/mariadb-test.manpages 0 → 100644
View file @ dace5f9a
debian/tmp/usr/share/man/man1/mysql_client_test.1
debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
debian/tmp/usr/share/man/man1/mysqltest.1
debian/tmp/usr/share/man/man1/mysqltest_embedded.1
debian/mysql-common.files deleted 100644 → 0
View file @ 951ca5dd
etc/mysql/my.cnf
usr/share/mysql-common/internal-use-only
debian/mysql-common.install 0 → 100644
View file @ dace5f9a
debian/additions/my.cnf etc/mysql
usr/share/mysql-common/internal-use-only
\ No newline at end of file
debian/po/ar.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: templates\n" "Project-Id-Version: templates\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-05-01 13:04+0300\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n" "Language-Team: Arabic <support@arabeyes.org>\n"
...@@ -25,40 +25,35 @@ msgstr "" ...@@ -25,40 +25,35 @@ msgstr ""
": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" ": n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "هل فعلاً تريد التثبيط؟" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام "
"قواعد البيانات الحالية."
#. Type: note #. Type: note
#. Description #. Description
...@@ -111,31 +106,15 @@ msgstr "" ...@@ -111,31 +106,15 @@ msgstr ""
"إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت " "إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت "
"حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات." "حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "تشغيل خادم MariaDB عند الإقلاع؟"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/init."
"d/mysql start'."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -145,7 +124,7 @@ msgstr "" ...@@ -145,7 +124,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -153,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة ...@@ -153,7 +132,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MariaDB \"root\" user:" #| msgid "New password for the MariaDB \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -161,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب ...@@ -161,13 +140,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -179,7 +158,7 @@ msgstr "" ...@@ -179,7 +158,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "You should check the account's password after tha package installation." #| "You should check the account's password after tha package installation."
...@@ -188,7 +167,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب ...@@ -188,7 +167,7 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -197,21 +176,54 @@ msgid "" ...@@ -197,21 +176,54 @@ msgid ""
"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
"more information." "more information."
msgstr "" msgstr ""
"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد من " "الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.2/README.Debian للمزيد "
"المعلومات." "من المعلومات."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "هل فعلاً تريد التثبيط؟"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "هذا الملف دلالة على أن نسخة أحدث من حزمة mariadb-server تم تثبيتها مسبقاً."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "ليست هناك أية ضمانة أن النسخة التي تقوم بتثبيتها ستكون قادرة على استخدام "
#~ "قواعد البيانات الحالية."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "تشغيل خادم MariaDB عند الإقلاع؟"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "يمكن تشغيل خادم MariaDB آلياً وقت الإقلاع أو يدوياً باستخدام الأمر '/etc/"
#~ "init.d/mysql start'."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/ca.po
View file @ dace5f9a
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-4.1\n" "Project-Id-Version: mysql-dfsg-4.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2004-01-31 19:20GMT\n" "PO-Revision-Date: 2004-01-31 19:20GMT\n"
"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n" "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
"Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n" "Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
...@@ -15,32 +15,34 @@ msgstr "" ...@@ -15,32 +15,34 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
#. Type: note #. Type: note
...@@ -90,35 +92,15 @@ msgid "" ...@@ -90,35 +92,15 @@ msgid ""
"the data should be kept." "the data should be kept."
msgstr "" msgstr ""
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, fuzzy
#| msgid "Should MySQL start on boot?"
msgid "Start the MariaDB server on boot?"
msgstr "Voleu que el MariaDB s'inici a l'arrencada ?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, fuzzy
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"El MariaDB es pot executar a l'arrencada o noms si executeu manualment '/"
"etc/init.d/mysql start'. Seleccioneu 's' si voleu que s'inicialitzi "
"automticament."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "" msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -126,25 +108,25 @@ msgstr "" ...@@ -126,25 +108,25 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "" msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -153,13 +135,13 @@ msgstr "" ...@@ -153,13 +135,13 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
"more information." "more information."
...@@ -167,16 +149,30 @@ msgstr "" ...@@ -167,16 +149,30 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#, fuzzy
#~| msgid "Should MySQL start on boot?"
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Voleu que el MariaDB s'inici a l'arrencada ?"
#, fuzzy
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "El MariaDB es pot executar a l'arrencada o noms si executeu manualment '/"
#~ "etc/init.d/mysql start'. Seleccioneu 's' si voleu que s'inicialitzi "
#~ "automticament."
#, fuzzy #, fuzzy
#~ msgid "" #~ msgid ""
#~ "To use mysql you must install an equivalent user and group to the " #~ "To use mysql you must install an equivalent user and group to the "
......
debian/po/cs.po
View file @ dace5f9a
...@@ -15,7 +15,7 @@ msgid "" ...@@ -15,7 +15,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n" "Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-05-01 13:01+0200\n" "PO-Revision-Date: 2007-05-01 13:01+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
...@@ -24,40 +24,35 @@ msgstr "" ...@@ -24,40 +24,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Opravdu pokračovat v degradaci?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Neexistuje žádná záruka, že momentálně instalovaná verze bude umět pracovat "
"se stávajícími databázemi."
#. Type: note #. Type: note
#. Description #. Description
...@@ -114,31 +109,15 @@ msgstr "" ...@@ -114,31 +109,15 @@ msgstr ""
"MariaDB, nebo pokud tato data souběžně využívá jiný balík mariadb-server, " "MariaDB, nebo pokud tato data souběžně využívá jiný balík mariadb-server, "
"měli byste data ponechat." "měli byste data ponechat."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Spustit MariaDB server při startu systému?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"MariaDB se může spouštět automaticky při startu systému, nebo ručně příkazem "
"'/etc/init.d/mysql start'."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nové heslo MariaDB uživatele \"root\":" msgstr "Nové heslo MariaDB uživatele \"root\":"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -148,7 +127,7 @@ msgstr "" ...@@ -148,7 +127,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -156,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění." ...@@ -156,7 +135,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -164,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":" ...@@ -164,13 +143,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Nelze nastavit heslo MariaDB uživatele \"root\"" msgstr "Nelze nastavit heslo MariaDB uživatele \"root\""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -182,7 +161,7 @@ msgstr "" ...@@ -182,7 +161,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "You should check the account's password after tha package installation." #| "You should check the account's password after tha package installation."
...@@ -191,7 +170,7 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." ...@@ -191,7 +170,7 @@ msgstr "Po instalaci balíku byste měli heslo ověřit."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -204,16 +183,49 @@ msgstr "" ...@@ -204,16 +183,49 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Opravdu pokračovat v degradaci?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "To znamená, že již byl nainstalován balík mariadb-server s vyšší verzí."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Neexistuje žádná záruka, že momentálně instalovaná verze bude umět "
#~ "pracovat se stávajícími databázemi."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Spustit MariaDB server při startu systému?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "MariaDB se může spouštět automaticky při startu systému, nebo ručně "
#~ "příkazem '/etc/init.d/mysql start'."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/da.po
View file @ dace5f9a
...@@ -15,7 +15,7 @@ msgid "" ...@@ -15,7 +15,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-4.1\n" "Project-Id-Version: mysql-dfsg-4.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-05-30 22:41+0200\n" "PO-Revision-Date: 2007-05-30 22:41+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n" "Language-Team: Danish\n"
...@@ -25,42 +25,35 @@ msgstr "" ...@@ -25,42 +25,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "nsker du virkelig at fortstte nedgraderingen?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
"Der er en fil med navnet /var/lib/mysql/debian-*.flag p dette system."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Sdan en fil tyder p at der tidligere har vret installeret en hjere "
"version af mariadb-server-pakken."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Det kan ikke garanteres at den version, du er ved at installere, kan benytte "
"data fra de eksisterende databaser."
#. Type: note #. Type: note
#. Description #. Description
...@@ -117,31 +110,15 @@ msgstr "" ...@@ -117,31 +110,15 @@ msgstr ""
"eller hvis en anden mariadb-server-pakke allerede benytter den, br dataene " "eller hvis en anden mariadb-server-pakke allerede benytter den, br dataene "
"bevares." "bevares."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Start MariaDB-serveren under systemopstart?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"MariaDB-serveren kan enten startes op automatisk under systemopstarten, "
"eller manuelt med kommandoen '/etc/init.d/mysql start'."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -151,7 +128,7 @@ msgstr "" ...@@ -151,7 +128,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -159,7 +136,7 @@ msgstr "Hvis du lader dette felt st ...@@ -159,7 +136,7 @@ msgstr "Hvis du lader dette felt st
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -167,13 +144,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" ...@@ -167,13 +144,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger" msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -186,13 +163,13 @@ msgstr "" ...@@ -186,13 +163,13 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -206,16 +183,51 @@ msgstr "" ...@@ -206,16 +183,51 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "nsker du virkelig at fortstte nedgraderingen?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "Der er en fil med navnet /var/lib/mysql/debian-*.flag p dette system."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Sdan en fil tyder p at der tidligere har vret installeret en hjere "
#~ "version af mariadb-server-pakken."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Det kan ikke garanteres at den version, du er ved at installere, kan "
#~ "benytte data fra de eksisterende databaser."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Start MariaDB-serveren under systemopstart?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "MariaDB-serveren kan enten startes op automatisk under systemopstarten, "
#~ "eller manuelt med kommandoen '/etc/init.d/mysql start'."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/de.po
View file @ dace5f9a
...@@ -16,7 +16,7 @@ msgid "" ...@@ -16,7 +16,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2009-08-27 22:41+0200\n" "PO-Revision-Date: 2009-08-27 22:41+0200\n"
"Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n" "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n"
"Language-Team: german <debian-l10n-german@lists.debian.org>\n" "Language-Team: german <debian-l10n-german@lists.debian.org>\n"
...@@ -27,39 +27,35 @@ msgstr "" ...@@ -27,39 +27,35 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Möchten Sie wirklich eine ältere Version einspielen?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
"Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/debian-*."
"flag"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket mit "
"einer höheren Version installiert war."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Es kann nicht garantiert werden, dass die gegenwärtig zu installierende "
"Version dessen Daten benutzen kann."
#. Type: note #. Type: note
#. Description #. Description
...@@ -115,31 +111,15 @@ msgstr "" ...@@ -115,31 +111,15 @@ msgstr ""
"ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten " "ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten "
"behalten werden." "behalten werden."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Soll der MariaDB-Server automatisch beim Booten starten?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder manuell "
"durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet werden."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Neues Passwort für den MariaDB »root«-Benutzer:" msgstr "Neues Passwort für den MariaDB »root«-Benutzer:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -149,25 +129,25 @@ msgstr "" ...@@ -149,25 +129,25 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert." msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen" msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -180,7 +160,7 @@ msgstr "" ...@@ -180,7 +160,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"Sie sollten das Passwort des administrativen Benutzers nach der " "Sie sollten das Passwort des administrativen Benutzers nach der "
...@@ -188,7 +168,7 @@ msgstr "" ...@@ -188,7 +168,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for "
...@@ -202,15 +182,47 @@ msgstr "" ...@@ -202,15 +182,47 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "Passwort-Eingabefehler" msgstr "Passwort-Eingabefehler"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
"Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte "
"erneut versuchen." "erneut versuchen."
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Möchten Sie wirklich eine ältere Version einspielen?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "Auf diesem System existiert eine Datei mit dem Namen /var/lib/mysql/"
#~ "debian-*.flag"
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Diese Datei ist ein Hinweis darauf, dass früher ein MariaDB-Server-Paket "
#~ "mit einer höheren Version installiert war."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Es kann nicht garantiert werden, dass die gegenwärtig zu installierende "
#~ "Version dessen Daten benutzen kann."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Soll der MariaDB-Server automatisch beim Booten starten?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "Der MariaDB-Dienst kann entweder automatisch beim Systemstart oder "
#~ "manuell durch Eingabe des Befehls »/etc/init.d/mysql start« gestartet "
#~ "werden."
debian/po/es.po
View file @ dace5f9a
...@@ -41,7 +41,7 @@ msgid "" ...@@ -41,7 +41,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-05-28 22:21+0200\n" "PO-Revision-Date: 2007-05-28 22:21+0200\n"
"Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian l10 Spanish <debian-l10n-spanish@lists.debian.org>\n" "Language-Team: Debian l10 Spanish <debian-l10n-spanish@lists.debian.org>\n"
...@@ -50,42 +50,35 @@ msgstr "" ...@@ -50,42 +50,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "¿Desea realmente continuar con la desactualización?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
"Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este sistema."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Este fichero indica que se instaló previamente una versión superior del "
"paquete mariadb-server."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"No se puede garantizar que la versión que está instalando pueda usar la base "
"de datos actual."
#. Type: note #. Type: note
#. Description #. Description
...@@ -143,31 +136,15 @@ msgstr "" ...@@ -143,31 +136,15 @@ msgstr ""
"MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los " "MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los "
"está utilizando." "está utilizando."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"El servidor MariaDB puede iniciarse en el momento de arranque del sistema o "
"manualmente si escribe la orden «/etc/init.d/mysql start»."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nueva contraseña para el usuario «root» de MariaDB:" msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -177,7 +154,7 @@ msgstr "" ...@@ -177,7 +154,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -185,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco." ...@@ -185,7 +162,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -193,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:" ...@@ -193,13 +170,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB" msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -212,7 +189,7 @@ msgstr "" ...@@ -212,7 +189,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"Debería comprobar la contraseña de la cuenta después de la instalación del " "Debería comprobar la contraseña de la cuenta después de la instalación del "
...@@ -220,7 +197,7 @@ msgstr "" ...@@ -220,7 +197,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -234,16 +211,52 @@ msgstr "" ...@@ -234,16 +211,52 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "¿Desea realmente continuar con la desactualización?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "Existe un archivo con el nombre /var/lib/mysql/debian-*.flag en este "
#~ "sistema."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Este fichero indica que se instaló previamente una versión superior del "
#~ "paquete mariadb-server."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "No se puede garantizar que la versión que está instalando pueda usar la "
#~ "base de datos actual."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "El servidor MariaDB puede iniciarse en el momento de arranque del sistema "
#~ "o manualmente si escribe la orden «/etc/init.d/mysql start»."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/eu.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: eu\n" "Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2009-07-29 11:59+0200\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n" "Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n"
...@@ -18,41 +18,35 @@ msgstr "" ...@@ -18,41 +18,35 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Benetan bertsio zaharragora itzuli nahi duzu?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat "
"instalatu dela adierazten du."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak "
"erabili ahal izango dituenik."
#. Type: note #. Type: note
#. Description #. Description
...@@ -109,31 +103,15 @@ msgstr "" ...@@ -109,31 +103,15 @@ msgstr ""
"bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, " "bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, "
"datuak mantendu egin beharko lirateke." "datuak mantendu egin beharko lirateke."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Abioan MariaDB zerbitzaria abiarazi?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init.d/"
"mysql start' eginaz."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -143,7 +121,7 @@ msgstr "" ...@@ -143,7 +121,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -151,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." ...@@ -151,19 +129,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri" msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -175,14 +153,14 @@ msgstr "" ...@@ -175,14 +153,14 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik." "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
...@@ -196,16 +174,50 @@ msgstr "" ...@@ -196,16 +174,50 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "Pasahitz sarrera errorea" msgstr "Pasahitz sarrera errorea"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz."
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat "
#~ "instalatu dela adierazten du."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Ezin da ziurtatu instalatzen ari zaren bertsio honek dauden datubaseak "
#~ "erabili ahal izango dituenik."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Abioan MariaDB zerbitzaria abiarazi?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "Sistema abioan MariaDB automatikoki abiarazi daiteke edo eskuz '/etc/init."
#~ "d/mysql start' eginaz."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/fr.po
View file @ dace5f9a
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: fr\n" "Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2009-08-08 14:56+0200\n" "PO-Revision-Date: 2009-08-08 14:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
...@@ -20,35 +20,35 @@ msgstr "" ...@@ -20,35 +20,35 @@ msgstr ""
"X-Generator: Lokalize 0.3\n" "X-Generator: Lokalize 0.3\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Faut-il vraiment revenir à la version précédente ?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Cela indique qu'une version plus récente du paquet mariadb-server a été "
"précédemment installée."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases." msgstr ""
msgstr "Il n'est pas garanti que cette version puisse en utiliser les données."
#. Type: note #. Type: note
#. Description #. Description
...@@ -103,31 +103,15 @@ msgstr "" ...@@ -103,31 +103,15 @@ msgstr ""
"Si vous prévoyez d'installer une version plus récente de MariaDB ou si un " "Si vous prévoyez d'installer une version plus récente de MariaDB ou si un "
"autre paquet mariadb-server les utilise déjà, vous devriez les conserver." "autre paquet mariadb-server les utilise déjà, vous devriez les conserver."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Faut-il lancer MariaDB au démarrage ?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /"
"etc/init.d/mysql start »."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" msgstr "Nouveau mot de passe du superutilisateur de MariaDB :"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -137,26 +121,26 @@ msgstr "" ...@@ -137,26 +121,26 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé." msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "" msgstr ""
"Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB" "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -168,7 +152,7 @@ msgstr "" ...@@ -168,7 +152,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"Vous devriez vérifier le mot de passe de ce compte après l'installation du " "Vous devriez vérifier le mot de passe de ce compte après l'installation du "
...@@ -176,7 +160,7 @@ msgstr "" ...@@ -176,7 +160,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
...@@ -190,18 +174,47 @@ msgstr "" ...@@ -190,18 +174,47 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "Erreur de saisie du mot de passe" msgstr "Erreur de saisie du mot de passe"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
"Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez "
"recommencer." "recommencer."
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Faut-il vraiment revenir à la version précédente ?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "Un fichier /var/lib/mysql/debian-*.flag est présent sur ce système."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Cela indique qu'une version plus récente du paquet mariadb-server a été "
#~ "précédemment installée."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Il n'est pas garanti que cette version puisse en utiliser les données."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Faut-il lancer MariaDB au démarrage ?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "MariaDB peut être lancé soit au démarrage, soit en entrant la commande « /"
#~ "etc/init.d/mysql start »."
#~ msgid "" #~ msgid ""
#~ "To use MySQL, the following entries for users and groups should be added " #~ "To use MySQL, the following entries for users and groups should be added "
#~ "to the system:" #~ "to the system:"
......
debian/po/gl.po
View file @ dace5f9a
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n" "Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-04-20 09:44+0200\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n" "Language-Team: Galician <proxecto@trasno.net>\n"
...@@ -15,41 +15,35 @@ msgstr "" ...@@ -15,41 +15,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "¿Quere pasar a unha versión anterior?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Este ficheiro indica que antes se instalou un paquete mariadb-server cunha "
"versión superior."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Non se pode garantir que a versión que está a instalar poida empregar as "
"bases de datos actuais."
#. Type: note #. Type: note
#. Description #. Description
...@@ -107,31 +101,15 @@ msgstr "" ...@@ -107,31 +101,15 @@ msgstr ""
"recente ou se xa hai un paquete mariadb-server diferente a empregalo, " "recente ou se xa hai un paquete mariadb-server diferente a empregalo, "
"debería conservar os datos." "debería conservar os datos."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "¿Iniciar o servidor MariaDB co ordenador?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, ou "
"manualmente coa orde \"/etc/init.d/mysql start\"."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -141,7 +119,7 @@ msgstr "" ...@@ -141,7 +119,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -149,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." ...@@ -149,7 +127,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -157,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" ...@@ -157,13 +135,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB" msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -175,7 +153,7 @@ msgstr "" ...@@ -175,7 +153,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "You should check the account's password after tha package installation." #| "You should check the account's password after tha package installation."
...@@ -184,7 +162,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. ...@@ -184,7 +162,7 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete.
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -198,16 +176,50 @@ msgstr "" ...@@ -198,16 +176,50 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "¿Quere pasar a unha versión anterior?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "Neste sistema hai un ficheiro chamado /var/lib/mysql/debian-*.flag."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Este ficheiro indica que antes se instalou un paquete mariadb-server "
#~ "cunha versión superior."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Non se pode garantir que a versión que está a instalar poida empregar as "
#~ "bases de datos actuais."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "¿Iniciar o servidor MariaDB co ordenador?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "Pódese iniciar automaticamente o servidor MariaDB ao iniciar o ordenador, "
#~ "ou manualmente coa orde \"/etc/init.d/mysql start\"."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/it.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2009-08-08 11:03+0200\n" "PO-Revision-Date: 2009-08-08 11:03+0200\n"
"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
...@@ -16,38 +16,35 @@ msgstr "" ...@@ -16,38 +16,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Procedere realmente con l'abbassamento di versione?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
"Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Quel file indica che in precedenza è stata installata una versione superiore "
"del pacchetto mariadb-server."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Non è garantito che la versione che si sta installando sia in grado di usare "
"i database presenti."
#. Type: note #. Type: note
#. Description #. Description
...@@ -103,31 +100,15 @@ msgstr "" ...@@ -103,31 +100,15 @@ msgstr ""
"recente oppure se sono già in uso da un altro pacchetto mariadb-server, i " "recente oppure se sono già in uso da un altro pacchetto mariadb-server, i "
"dati non devono essere eliminati." "dati non devono essere eliminati."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Lanciare il server MariaDB all'avvio?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
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»."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nuova password per l'utente «root» di MariaDB:" msgstr "Nuova password per l'utente «root» di MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -137,25 +118,25 @@ msgstr "" ...@@ -137,25 +118,25 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata." msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "Ripetere la password per l'utente «root» di MariaDB:" msgstr "Ripetere la password per l'utente «root» di MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Impossibile impostare la password per l'utente «root» di MariaDB" msgstr "Impossibile impostare la password per l'utente «root» di MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -168,14 +149,14 @@ msgstr "" ...@@ -168,14 +149,14 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"Al termine dell'installazione si deve verificare la password dell'account." "Al termine dell'installazione si deve verificare la password dell'account."
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
...@@ -189,13 +170,43 @@ msgstr "" ...@@ -189,13 +170,43 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "Errore di inserimento della password" msgstr "Errore di inserimento della password"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "Le due password inserite sono diverse. Riprovare." msgstr "Le due password inserite sono diverse. Riprovare."
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Procedere realmente con l'abbassamento di versione?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Quel file indica che in precedenza è stata installata una versione "
#~ "superiore del pacchetto mariadb-server."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Non è garantito che la versione che si sta installando sia in grado di "
#~ "usare i database presenti."
#~ 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»."
debian/po/ja.po
View file @ dace5f9a
...@@ -16,7 +16,7 @@ msgid "" ...@@ -16,7 +16,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2009-09-01 08:25+0900\n" "PO-Revision-Date: 2009-09-01 08:25+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
...@@ -25,39 +25,35 @@ msgstr "" ...@@ -25,39 +25,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "本当にダウングレードを実行しますか?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
"このシステムには /var/lib/mysql/debian-*.flag という名前のファイルが存在して"
"います。"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"このファイルが意味するのは、以前により新しいバージョンの mariadb-server パッ"
"ケージがインストールされていたことを示します。"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"このデータベースを現在インストールしようとしているバージョンで使えるかどうか"
"は保証できません。"
#. Type: note #. Type: note
#. Description #. Description
...@@ -111,31 +107,15 @@ msgstr "" ...@@ -111,31 +107,15 @@ msgstr ""
"ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に" "ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に"
"使っている場合、データは保持する必要があります。" "使っている場合、データは保持する必要があります。"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "MariaDB をシステム起動時に開始しますか?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは '/"
"etc/init.d/mysql start' と手で入力して起動するかを選べます。"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -145,25 +125,25 @@ msgstr "" ...@@ -145,25 +125,25 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -175,14 +155,14 @@ msgstr "" ...@@ -175,14 +155,14 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
"パッケージのインストール後、アカウントのパスワードを確認する必要があります。" "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " #| "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
...@@ -195,13 +175,44 @@ msgstr "" ...@@ -195,13 +175,44 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "パスワード入力エラー" msgstr "パスワード入力エラー"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "入力された二つのパスワードが一致しません。再入力してください。" msgstr "入力された二つのパスワードが一致しません。再入力してください。"
#~ msgid "Really proceed with downgrade?"
#~ msgstr "本当にダウングレードを実行しますか?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "このシステムには /var/lib/mysql/debian-*.flag という名前のファイルが存在"
#~ "しています。"
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "このファイルが意味するのは、以前により新しいバージョンの mariadb-server "
#~ "パッケージがインストールされていたことを示します。"
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "このデータベースを現在インストールしようとしているバージョンで使えるかどう"
#~ "かは保証できません。"
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "MariaDB をシステム起動時に開始しますか?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは "
#~ "'/etc/init.d/mysql start' と手で入力して起動するかを選べます。"
debian/po/nb.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql_nb\n" "Project-Id-Version: mysql_nb\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-02-18 12:13+0100\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n"
"Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
...@@ -17,43 +17,34 @@ msgstr "" ...@@ -17,43 +17,34 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n" "X-Generator: KBabel 1.11.2\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy msgid "The old data directory will be saved at new location"
#| msgid "Do you really want to downgrade?" msgstr ""
msgid "Really proceed with downgrade?"
msgstr "Er du sikker på at du vil nedgradere?"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.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 "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en "
"mariadb-server-pakke med et høyere versjonsnummer har vært installert før. "
"Det kan ikke garanteres at denne versjonen kan bruke data fra den høyere "
"versjonen."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
#. Type: note #. Type: note
...@@ -111,31 +102,9 @@ msgstr "" ...@@ -111,31 +102,9 @@ msgstr ""
"beholdes hvis det bare skal installeres en høyere MariaDB-versjon, eller " "beholdes hvis det bare skal installeres en høyere MariaDB-versjon, eller "
"hvis en annen mariadb-server-pakke allerede bruker den." "hvis en annen mariadb-server-pakke allerede bruker den."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, fuzzy
#| msgid "Should MySQL start on boot?"
msgid "Start the MariaDB server on boot?"
msgstr "Skal MariaDB startes ved maskinoppstart?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, 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 startes automatisk når maskinen starter, eller bare hvis du "
"skriver «/etc/init.d/mysql start»."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
...@@ -143,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" ...@@ -143,7 +112,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It is highly recommended that you set a password for the MySQL " #| "It is highly recommended that you set a password for the MySQL "
...@@ -157,13 +126,13 @@ msgstr "" ...@@ -157,13 +126,13 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "" msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -171,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" ...@@ -171,7 +140,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "Unable to set password for MySQL \"root\" user" #| msgid "Unable to set password for MySQL \"root\" user"
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
...@@ -179,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" ...@@ -179,7 +148,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It seems an error occurred while setting the password for the MySQL " #| "It seems an error occurred while setting the password for the MySQL "
...@@ -198,13 +167,13 @@ msgstr "" ...@@ -198,13 +167,13 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
"more information." "more information."
...@@ -212,16 +181,51 @@ msgstr "" ...@@ -212,16 +181,51 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#, fuzzy
#~| msgid "Do you really want to downgrade?"
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Er du sikker på at du vil nedgradere?"
#, 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 ""
#~ "ADVARSEL: Fila /var/lib/mysql/debian-*.flag finnes. Dette viser at en "
#~ "mariadb-server-pakke med et høyere versjonsnummer har vært installert "
#~ "før. Det kan ikke garanteres at denne versjonen kan bruke data fra den "
#~ "høyere versjonen."
#, fuzzy
#~| msgid "Should MySQL start on boot?"
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Skal MariaDB startes ved maskinoppstart?"
#, 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 startes automatisk når maskinen starter, eller bare hvis du "
#~ "skriver «/etc/init.d/mysql start»."
#~ msgid "" #~ msgid ""
#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
#~ msgstr "" #~ msgstr ""
......
debian/po/nl.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2006-02-19 10:20+0100\n" "PO-Revision-Date: 2006-02-19 10:20+0100\n"
"Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n" "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n"
"Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n" "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
...@@ -16,44 +16,34 @@ msgstr "" ...@@ -16,44 +16,34 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy msgid "The old data directory will be saved at new location"
#| msgid "Do you really want to downgrade?" msgstr ""
msgid "Really proceed with downgrade?"
msgstr "Wilt u echt een oude versie herstellen?"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.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 "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" 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."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
#. Type: note #. Type: note
...@@ -112,31 +102,9 @@ msgstr "" ...@@ -112,31 +102,9 @@ msgstr ""
"een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data " "een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data "
"moeten worden behouden." "moeten worden behouden."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, fuzzy
#| msgid "Should MySQL start on boot?"
msgid "Start the MariaDB server on boot?"
msgstr "Moet MariaDB starten als de computer start?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, 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."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
...@@ -144,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" ...@@ -144,7 +112,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It is highly recommended that you set a password for the MySQL " #| "It is highly recommended that you set a password for the MySQL "
...@@ -158,13 +126,13 @@ msgstr "" ...@@ -158,13 +126,13 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "" msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -172,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" ...@@ -172,7 +140,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "Unable to set password for MySQL \"root\" user" #| msgid "Unable to set password for MySQL \"root\" user"
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
...@@ -180,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" ...@@ -180,7 +148,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It seems an error occurred while setting the password for the MySQL " #| "It seems an error occurred while setting the password for the MySQL "
...@@ -199,13 +167,13 @@ msgstr "" ...@@ -199,13 +167,13 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
"more information." "more information."
...@@ -213,16 +181,52 @@ msgstr "" ...@@ -213,16 +181,52 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#, fuzzy
#~| msgid "Do you really want to downgrade?"
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Wilt u echt een oude versie herstellen?"
#, 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."
#, 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 "" #~ msgid ""
#~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
#~ msgstr "" #~ msgstr ""
......
debian/po/pt.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n" "Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-05-05 21:01+0100\n" "PO-Revision-Date: 2007-05-05 21:01+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n"
...@@ -16,41 +16,35 @@ msgstr "" ...@@ -16,41 +16,35 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Deseja mesmo fazer downgrade?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-"
"server com um número de versão superior."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Não existe nenhuma garantia que a versão que está actualmente a instalar "
"seja capaz de utilizar as bases de dados actuais."
#. Type: note #. Type: note
#. Description #. Description
...@@ -107,31 +101,15 @@ msgstr "" ...@@ -107,31 +101,15 @@ msgstr ""
"versão mais recente ou se um pacote mariadb-server já está os está a " "versão mais recente ou se um pacote mariadb-server já está os está a "
"utilizar, os dados devem ser mantidos." "utilizar, os dados devem ser mantidos."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Iniciar o servidor MariaDB no arranque?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"O MariaDB pode ser automaticamente lançado no arranque ou manualmente "
"através do comando '/etc/init.d/mysql start'."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -141,7 +119,7 @@ msgstr "" ...@@ -141,7 +119,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -150,7 +128,7 @@ msgstr "" ...@@ -150,7 +128,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -158,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" ...@@ -158,7 +136,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "" msgstr ""
"Não foi possível definir a palavra-passe para o utilizador \"root\" do " "Não foi possível definir a palavra-passe para o utilizador \"root\" do "
...@@ -166,7 +144,7 @@ msgstr "" ...@@ -166,7 +144,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -179,7 +157,7 @@ msgstr "" ...@@ -179,7 +157,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "You should check the account's password after tha package installation." #| "You should check the account's password after tha package installation."
...@@ -189,7 +167,7 @@ msgstr "" ...@@ -189,7 +167,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -203,16 +181,51 @@ msgstr "" ...@@ -203,16 +181,51 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Deseja mesmo fazer downgrade?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr ""
#~ "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "Tal ficheiro significa que anteriormente foi instalado um pacote mariadb-"
#~ "server com um número de versão superior."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Não existe nenhuma garantia que a versão que está actualmente a instalar "
#~ "seja capaz de utilizar as bases de dados actuais."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Iniciar o servidor MariaDB no arranque?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "O MariaDB pode ser automaticamente lançado no arranque ou manualmente "
#~ "através do comando '/etc/init.d/mysql start'."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/pt_BR.po
View file @ dace5f9a
...@@ -9,7 +9,7 @@ msgid "" ...@@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mysql-dfsg-5.1\n" "Project-Id-Version: mysql-dfsg-5.1\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2007-04-21 15:59-0300\n" "PO-Revision-Date: 2007-04-21 15:59-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
...@@ -19,41 +19,35 @@ msgstr "" ...@@ -19,41 +19,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"pt_BR utf-8\n" "pt_BR utf-8\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "Really proceed with downgrade?" msgid "The old data directory will be saved at new location"
msgstr "Realmente proceder com o rebaixamento de versão?" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema." "A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy
#| msgid ""
#| "Such file is an indication that a mariadb-server package with a higher "
#| "version has been installed earlier."
msgid "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"A presença de um arquivo como este é uma indicação de que um pacote mariadb-"
"server com um número de versão mais alto já foi instalado anteriormente."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
"Não há garantias de que a versão que você está instalando no momento "
"conseguirá utilizar as bases de dados existentes."
#. Type: note #. Type: note
#. Description #. Description
...@@ -110,31 +104,15 @@ msgstr "" ...@@ -110,31 +104,15 @@ msgstr ""
"versão mais recente ou, caso uma versão diferente do pacote mariadb-server " "versão mais recente ou, caso uma versão diferente do pacote mariadb-server "
"esteja sendo utilizada, os dados deverão ser mantidos." "esteja sendo utilizada, os dados deverão ser mantidos."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid "Start the MariaDB server on boot?"
msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
msgid ""
"The MariaDB server can be launched automatically at boot time or manually "
"with the '/etc/init.d/mysql start' command."
msgstr ""
"O servidor MariaDB pode ser iniciado automaticamente junto a inicialização "
"da máquina ou manualmente com o comando '/etc/init.d/mysql start'."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
msgstr "Nova senha para o usuário \"root\" do MariaDB:" msgstr "Nova senha para o usuário \"root\" do MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "" msgid ""
"While not mandatory, it is highly recommended that you set a password for " "While not mandatory, it is highly recommended that you set a password for "
"the MariaDB administrative \"root\" user." "the MariaDB administrative \"root\" user."
...@@ -144,7 +122,7 @@ msgstr "" ...@@ -144,7 +122,7 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "If that field is left blank, the password will not be changed." #| msgid "If that field is left blank, the password will not be changed."
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
...@@ -152,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." ...@@ -152,7 +130,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for the MySQL \"root\" user:" #| msgid "New password for the MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -160,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:" ...@@ -160,13 +138,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
msgstr "Impossível definir senha para o usuário \"root\" do MariaDB" msgstr "Impossível definir senha para o usuário \"root\" do MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"An error occurred while setting the password for the MariaDB administrative " "An error occurred while setting the password for the MariaDB administrative "
"user. This may have happened because the account already has a password, or " "user. This may have happened because the account already has a password, or "
...@@ -179,7 +157,7 @@ msgstr "" ...@@ -179,7 +157,7 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "You should check the account's password after tha package installation." #| "You should check the account's password after tha package installation."
...@@ -188,7 +166,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco ...@@ -188,7 +166,7 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
...@@ -202,16 +180,52 @@ msgstr "" ...@@ -202,16 +180,52 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Realmente proceder com o rebaixamento de versão?"
#~ msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
#~ msgstr "Um arquivo de nome /var/lib/mysql/debian-*.flag existe no sistema."
#, fuzzy
#~| msgid ""
#~| "Such file is an indication that a mariadb-server package with a higher "
#~| "version has been installed earlier."
#~ msgid ""
#~ "Such a file is an indication that a mariadb-server package with a higher "
#~ "version has been installed previously."
#~ msgstr ""
#~ "A presença de um arquivo como este é uma indicação de que um pacote "
#~ "mariadb-server com um número de versão mais alto já foi instalado "
#~ "anteriormente."
#~ msgid ""
#~ "There is no guarantee that the version you're currently installing will "
#~ "be able to use the current databases."
#~ msgstr ""
#~ "Não há garantias de que a versão que você está instalando no momento "
#~ "conseguirá utilizar as bases de dados existentes."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Iniciar o servidor MariaDB junto a inicialização da máquina?"
#~ msgid ""
#~ "The MariaDB server can be launched automatically at boot time or manually "
#~ "with the '/etc/init.d/mysql start' command."
#~ msgstr ""
#~ "O servidor MariaDB pode ser iniciado automaticamente junto a "
#~ "inicialização da máquina ou manualmente com o comando '/etc/init.d/mysql "
#~ "start'."
#~ msgid "" #~ msgid ""
#~ "To use MariaDB, the following entries for users and groups should be " #~ "To use MariaDB, the following entries for users and groups should be "
#~ "added to the system:" #~ "added to the system:"
......
debian/po/ro.po
View file @ dace5f9a
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: po-debconf://mysql-dfsg\n" "Project-Id-Version: po-debconf://mysql-dfsg\n"
"Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n" "Report-Msgid-Bugs-To: mariadb-10.2@packages.debian.org\n"
"POT-Creation-Date: 2012-01-12 13:08+0100\n" "POT-Creation-Date: 2016-10-08 01:26+0300\n"
"PO-Revision-Date: 2006-12-20 21:27+0200\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n"
"Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n" "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n"
"Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n" "Language-Team: romanian <debian-l10n-romanian@lists.debian.org>\n"
...@@ -17,43 +17,34 @@ msgstr "" ...@@ -17,43 +17,34 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
#, fuzzy msgid "The old data directory will be saved at new location"
#| msgid "Do you really want to downgrade?" msgstr ""
msgid "Really proceed with downgrade?"
msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?"
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgid ""
"A file named /var/lib/mysql/debian-*.flag exists on this system. The number "
"indicates a database binary format version that cannot automatically be "
"upgraded (or downgraded)."
msgstr "" msgstr ""
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.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 "" msgid ""
"Such a file is an indication that a mariadb-server package with a higher " "Therefore the previous data directory will be renamed to /var/lib/mysql-* "
"version has been installed previously." "and a new data directory will be initialized at /var/lib/mysql."
msgstr "" msgstr ""
"AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru "
"indică faptul că anterior a fost instalată o versiune nouă a pachetului "
"mariadb-server. Nu se poate garanta că versiunea instalată acum poate folosi "
"datele versiunii instalate anterior."
#. Type: boolean #. Type: note
#. Description #. Description
#: ../mariadb-server-10.2.templates:2001 #: ../mariadb-server-10.2.templates:2001
msgid "" msgid ""
"There is no guarantee that the version you're currently installing will be " "Please manually export/import your data (e.g. with mysqldump) if needed."
"able to use the current databases."
msgstr "" msgstr ""
#. Type: note #. Type: note
...@@ -111,31 +102,9 @@ msgstr "" ...@@ -111,31 +102,9 @@ msgstr ""
"doar să instalaţi o versiune nouă MariaDB sau datele sunt folosite de către " "doar să instalaţi o versiune nouă MariaDB sau datele sunt folosite de către "
"un alt pachet mariadb-server, atunci ar trebui păstraţi datele." "un alt pachet mariadb-server, atunci ar trebui păstraţi datele."
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, fuzzy
#| msgid "Should MySQL start on boot?"
msgid "Start the MariaDB server on boot?"
msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?"
#. Type: boolean
#. Description
#: ../mariadb-server-10.2.templates:5001
#, 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 poate porni automat la iniţializarea sistemului sau doar dacă rulaţi "
"comanda „/etc/init.d/mysql start”."
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "New password for the MariaDB \"root\" user:" msgid "New password for the MariaDB \"root\" user:"
...@@ -143,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" ...@@ -143,7 +112,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It is highly recommended that you set a password for the MySQL " #| "It is highly recommended that you set a password for the MySQL "
...@@ -157,13 +126,13 @@ msgstr "" ...@@ -157,13 +126,13 @@ msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:6001 #: ../mariadb-server-10.2.templates:5001
msgid "If this field is left blank, the password will not be changed." msgid "If this field is left blank, the password will not be changed."
msgstr "" msgstr ""
#. Type: password #. Type: password
#. Description #. Description
#: ../mariadb-server-10.2.templates:7001 #: ../mariadb-server-10.2.templates:6001
#, fuzzy #, fuzzy
#| msgid "New password for MySQL \"root\" user:" #| msgid "New password for MySQL \"root\" user:"
msgid "Repeat password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:"
...@@ -171,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" ...@@ -171,7 +140,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "Unable to set password for MySQL \"root\" user" #| msgid "Unable to set password for MySQL \"root\" user"
msgid "Unable to set password for the MariaDB \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user"
...@@ -179,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" ...@@ -179,7 +148,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB"
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
#, fuzzy #, fuzzy
#| msgid "" #| msgid ""
#| "It seems an error occurred while setting the password for the MySQL " #| "It seems an error occurred while setting the password for the MySQL "
...@@ -198,13 +167,13 @@ msgstr "" ...@@ -198,13 +167,13 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "You should check the account's password after the package installation." msgid "You should check the account's password after the package installation."
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:8001 #: ../mariadb-server-10.2.templates:7001
msgid "" msgid ""
"Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for " "Please read the /usr/share/doc/mariadb-server-10.2/README.Debian file for "
"more information." "more information."
...@@ -212,16 +181,51 @@ msgstr "" ...@@ -212,16 +181,51 @@ msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "Password input error" msgid "Password input error"
msgstr "" msgstr ""
#. Type: error #. Type: error
#. Description #. Description
#: ../mariadb-server-10.2.templates:9001 #: ../mariadb-server-10.2.templates:8001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#, fuzzy
#~| msgid "Do you really want to downgrade?"
#~ msgid "Really proceed with downgrade?"
#~ msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?"
#, 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 ""
#~ "AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru "
#~ "indică faptul că anterior a fost instalată o versiune nouă a pachetului "
#~ "mariadb-server. Nu se poate garanta că versiunea instalată acum poate "
#~ "folosi datele versiunii instalate anterior."
#, fuzzy
#~| msgid "Should MySQL start on boot?"
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?"
#, 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 poate porni automat la iniţializarea sistemului sau doar dacă "
#~ "rulaţi comanda „/etc/init.d/mysql start”."
#~ msgid "Cannot upgrade if ISAM tables are present!" #~ msgid "Cannot upgrade if ISAM tables are present!"
#~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!" #~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!"
......
debian/po/ru.po
View file @ dace5f9a
This diff is collapsed.
debian/po/sv.po
View file @ dace5f9a
This diff is collapsed.
debian/po/templates.pot
View file @ dace5f9a
This diff is collapsed.
debian/po/tr.po
View file @ dace5f9a
This diff is collapsed.
debian/rules
View file @ dace5f9a
This diff is collapsed.
include/atomic/nolock.h deleted 100644 → 0
View file @ 951ca5dd
#ifndef ATOMIC_NOLOCK_INCLUDED
#define ATOMIC_NOLOCK_INCLUDED
/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
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; version 2 of the License.
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.
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 */
#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
|| defined(HAVE_GCC_ATOMIC_BUILTINS) \
|| defined(HAVE_SOLARIS_ATOMIC)
# ifdef MY_ATOMIC_MODE_DUMMY
# define LOCK_prefix ""
# else
# define LOCK_prefix "lock"
# endif
/*
We choose implementation as follows:
------------------------------------
On Windows using Visual C++ the native implementation should be
preferrable. When using gcc we prefer the Solaris implementation
before the gcc because of stability preference, we choose gcc
builtins if available, otherwise we choose the somewhat broken
native x86 implementation. If neither Visual C++ or gcc we still
choose the Solaris implementation on Solaris (mainly for SunStudio
compilers).
*/
# if defined(_MSC_VER)
# include "generic-msvc.h"
# elif __GNUC__
# if defined(HAVE_SOLARIS_ATOMIC)
# include "solaris.h"
# elif defined(HAVE_GCC_ATOMIC_BUILTINS)
# include "gcc_builtins.h"
# elif defined(__i386__) || defined(__x86_64__)
# include "x86-gcc.h"
# endif
# elif defined(HAVE_SOLARIS_ATOMIC)
# include "solaris.h"
# endif
#endif
#endif /* ATOMIC_NOLOCK_INCLUDED */
include/atomic/x86-gcc.h
View file @ dace5f9a
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
*/ */
#undef MY_ATOMIC_HAS_8_AND_16 #undef MY_ATOMIC_HAS_8_AND_16
#ifdef MY_ATOMIC_MODE_DUMMY
#define LOCK_prefix ""
#else
#define LOCK_prefix "lock"
#endif
#ifdef __x86_64__ #ifdef __x86_64__
# ifdef MY_ATOMIC_NO_XADD # ifdef MY_ATOMIC_NO_XADD
# define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix "-no-xadd" # define MY_ATOMIC_MODE "gcc-amd64" LOCK_prefix "-no-xadd"
......
include/json_lib.h
View file @ dace5f9a
...@@ -226,6 +226,13 @@ int json_scan_next(json_engine_t *j); ...@@ -226,6 +226,13 @@ int json_scan_next(json_engine_t *j);
int json_read_keyname_chr(json_engine_t *j); int json_read_keyname_chr(json_engine_t *j);
/*
Check if the name of the current JSON key matches
the step of the path.
*/
int json_key_matches(json_engine_t *je, json_string_t *k);
/* /*
json_read_value() function parses the JSON value syntax, json_read_value() function parses the JSON value syntax,
so that we can handle the value of a key or an array item. so that we can handle the value of a key or an array item.
......
include/my_atomic.h
View file @ dace5f9a
...@@ -112,9 +112,26 @@ ...@@ -112,9 +112,26 @@
#undef MY_ATOMIC_HAS_8_16 #undef MY_ATOMIC_HAS_8_16
/* /*
* Attempt to do atomic ops without locks We choose implementation as follows:
*/ ------------------------------------
#include "atomic/nolock.h" On Windows using Visual C++ the native implementation should be
preferrable. When using gcc we prefer the Solaris implementation
before the gcc because of stability preference, we choose gcc
builtins if available, otherwise we choose the somewhat broken
native x86 implementation. If neither Visual C++ or gcc we still
choose the Solaris implementation on Solaris (mainly for SunStudio
compilers).
*/
#if defined(_MSC_VER)
#include "atomic/generic-msvc.h"
#elif defined(HAVE_SOLARIS_ATOMIC)
#include "atomic/solaris.h"
#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
#include "atomic/gcc_builtins.h"
#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
#include "atomic/x86-gcc.h"
#endif
#ifndef make_atomic_cas_body #ifndef make_atomic_cas_body
/* nolock.h was not able to generate even a CAS function, fall back */ /* nolock.h was not able to generate even a CAS function, fall back */
......
include/mysql.h.pp
View file @ dace5f9a
This diff is collapsed.
include/mysql_com.h
View file @ dace5f9a
This diff is collapsed.
mysql-test/include/binlog_start_pos.inc
View file @ dace5f9a
...@@ -10,19 +10,19 @@ ...@@ -10,19 +10,19 @@
# #
# Format_description_log_event length = # Format_description_log_event length =
# 19 /* event common header */ + # 19 /* event common header */ +
# 58 /* misc stuff in the Format description header */ + # 57 /* misc stuff in the Format description header */ +
# number of events + # number of events +
# 1 /* Checksum algorithm */ + # 1 /* Checksum algorithm */ +
# 4 /* CRC32 length */ # 4 /* CRC32 length */
# #
# With current number of events = 164, # With current number of events = 171,
# #
# binlog_start_pos = 4 + 19 + 57 + 163 + 1 + 4 = 249. # binlog_start_pos = 4 + 19 + 57 + 171 + 1 + 4 = 256.
# #
############################################################################## ##############################################################################
let $binlog_start_pos=249; let $binlog_start_pos=256;
--disable_query_log --disable_query_log
SET @binlog_start_pos=249; SET @binlog_start_pos=256;
--enable_query_log --enable_query_log
mysql-test/include/mtr_warnings.sql
View file @ dace5f9a
This diff is collapsed.
mysql-test/include/show_binlog_events2.inc
View file @ dace5f9a
This diff is collapsed.
mysql-test/lib/v1/mtr_report.pl
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/cte_recursive.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/ctype_ldml.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/derived_cond_pushdown.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/dyncol.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/flush2.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/func_json.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/innodb_mysql_lock.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/lock_sync.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/lock_tables_lost_commit.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/mdl_sync.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/mysqlbinlog_row_compressed.result 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/mysqlbinlog_row_minimal.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/mysqlbinlog_stmt_compressed.result 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/mysqld--help.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/partition_debug_sync.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/r/truncate_coverage.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/std_data/ldml/Index.xml
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/disabled.def
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/GAL-382.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/MW-252.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/MW-258.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/MW-259.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/MW-44.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/enforce_storage_engine2.result 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/galera#414.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/r/mdev_10518.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/t/enforce_storage_engine2.opt 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera/t/enforce_storage_engine2.test 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/galera_3nodes/disabled.def
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/aria.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/handler.inc
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/heap.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/innodb.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/interface.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/interface.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/handler/myisam.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/innodb/disabled.def
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/innodb/t/innodb_trx_weight.opt 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_binlog_compress.result 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/rpl/r/rpl_checksum.result
View file @ dace5f9a
This diff is collapsed.
mysql-test/suite/rpl/t/rpl_binlog_compress.test 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/cte_recursive.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/ctype_ldml.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/derived_cond_pushdown.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/dyncol.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/func_json.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/innodb_mysql_lock.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/lock_sync.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/mdl_sync.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/mysqlbinlog_row_compressed.test 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/mysqlbinlog_stmt_compressed.test 0 → 100644
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/partition_debug_sync.test
View file @ dace5f9a
This diff is collapsed.
mysql-test/t/truncate_coverage.test
View file @ dace5f9a
This diff is collapsed.
mysys/charset.c
View file @ dace5f9a
This diff is collapsed.
scripts/wsrep_sst_rsync.sh
View file @ dace5f9a
This diff is collapsed.
sql/field.cc
View file @ dace5f9a
This diff is collapsed.
sql/field.h
View file @ dace5f9a
This diff is collapsed.
sql/handler.cc
View file @ dace5f9a
This diff is collapsed.
sql/item.cc
View file @ dace5f9a
This diff is collapsed.
sql/item.h
View file @ dace5f9a
This diff is collapsed.
sql/item_cmpfunc.cc
View file @ dace5f9a
This diff is collapsed.
sql/item_create.cc
View file @ dace5f9a
This diff is collapsed.
sql/item_func.h
View file @ dace5f9a
This diff is collapsed.
sql/item_jsonfunc.cc
View file @ dace5f9a
This diff is collapsed.
sql/item_jsonfunc.h
View file @ dace5f9a
This diff is collapsed.
sql/lex.h
View file @ dace5f9a
This diff is collapsed.
sql/log.cc
View file @ dace5f9a
This diff is collapsed.
sql/log_event.cc
View file @ dace5f9a
This diff is collapsed.
sql/log_event.h
View file @ dace5f9a
This diff is collapsed.
sql/mdl.h
View file @ dace5f9a
This diff is collapsed.
sql/mysqld.cc
View file @ dace5f9a
This diff is collapsed.
sql/mysqld.h
View file @ dace5f9a
This diff is collapsed.
sql/protocol.cc
View file @ dace5f9a
This diff is collapsed.
sql/rpl_parallel.cc
View file @ dace5f9a
This diff is collapsed.
sql/rpl_rli.cc
View file @ dace5f9a
This diff is collapsed.
sql/share/errmsg-utf8.txt
View file @ dace5f9a
This diff is collapsed.
sql/slave.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_base.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_class.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_class.h
View file @ dace5f9a
This diff is collapsed.
sql/sql_cte.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_derived.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_error.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_error.h
View file @ dace5f9a
This diff is collapsed.
sql/sql_handler.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_insert.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_parse.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_plugin.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_plugin.h
View file @ dace5f9a
This diff is collapsed.
sql/sql_prepare.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_prepare.h
View file @ dace5f9a
This diff is collapsed.
sql/sql_repl.cc
View file @ dace5f9a
This diff is collapsed.
sql/sql_yacc.yy
View file @ dace5f9a
This diff is collapsed.
sql/sys_vars.cc
View file @ dace5f9a
This diff is collapsed.
sql/wsrep_mysqld.cc
View file @ dace5f9a
This diff is collapsed.
sql/wsrep_thd.cc
View file @ dace5f9a
This diff is collapsed.
sql/wsrep_var.cc
View file @ dace5f9a
This diff is collapsed.
storage/cassandra/CMakeLists.txt
View file @ dace5f9a
This diff is collapsed.
storage/connect/reldef.cpp
View file @ dace5f9a
This diff is collapsed.
storage/innobase/CMakeLists.txt
View file @ dace5f9a
This diff is collapsed.
storage/innobase/buf/buf0buf.cc
View file @ dace5f9a
This diff is collapsed.
storage/innobase/handler/ha_innodb.cc
View file @ dace5f9a
This diff is collapsed.
storage/innobase/handler/ha_innodb.h
View file @ dace5f9a
This diff is collapsed.
storage/innobase/include/ut0ut.h
View file @ dace5f9a
This diff is collapsed.
storage/innobase/lock/lock0lock.cc
View file @ dace5f9a
This diff is collapsed.
storage/innobase/srv/srv0start.cc
View file @ dace5f9a
This diff is collapsed.
storage/innobase/ut/ut0ut.cc
View file @ dace5f9a
This diff is collapsed.
storage/maria/ha_maria.cc
View file @ dace5f9a
This diff is collapsed.
storage/perfschema/pfs.cc
View file @ dace5f9a
This diff is collapsed.
storage/sphinx/mysql-test/sphinx/suite.pm
View file @ dace5f9a
This diff is collapsed.
storage/spider/CMakeLists.txt
View file @ dace5f9a
This diff is collapsed.
storage/spider/hs_client/allocator.hpp
View file @ dace5f9a
This diff is collapsed.
storage/tokudb/CMakeLists.txt
View file @ dace5f9a
This diff is collapsed.
storage/xtradb/CMakeLists.txt
View file @ dace5f9a
This diff is collapsed.
storage/xtradb/handler/ha_innodb.cc
View file @ dace5f9a
This diff is collapsed.
storage/xtradb/include/ut0ut.h
View file @ dace5f9a
This diff is collapsed.
storage/xtradb/lock/lock0lock.cc
View file @ dace5f9a
This diff is collapsed.
strings/ctype-uca.c
View file @ dace5f9a
This diff is collapsed.
strings/ctype.c
View file @ dace5f9a
This diff is collapsed.
strings/json_lib.c
View file @ dace5f9a
This diff is collapsed.
wsrep/wsrep_api.h
View file @ dace5f9a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7