diff options
Diffstat (limited to 'debian')
89 files changed, 1640 insertions, 2396 deletions
diff --git a/debian/README.Maintainer b/debian/README.Maintainer deleted file mode 100644 index b1e0a602781..00000000000 --- a/debian/README.Maintainer +++ /dev/null @@ -1,114 +0,0 @@ - -########################### -## FIXME for 5.1 ## -########################### - -* put this trigger-recreation thing into the init scripts -- what?! - -########################################################################### -# Here are some information that are only of interest for the current and # -# following Debian maintainers of MySQL. # -########################################################################### - -The debian/ directory is under SVN control, see debian/control for URL. - -# -# Preparing a new version -# -The new orig.tar.gz (without non-free documentation) is created in /tmp/ when -running this command: - -debian/rules get-orig-source - -# -# mysqlreport -# -The authors e-mail address is <public@codenode.com>. - -# -# Remarks to dependencies -# -libwrap0-dev (>= 7.6-8.3) - According to bug report 114582 where where build problems on - IA-64/sid with at least two prior versions. -psmisc - /usr/bin/killall in the initscript - -zlib1g in libmysqlclient-dev: - "mysql_config --libs" ads "-lz" - -Build-Dep: - -debhelper (>=4.1.16): - See po-debconf(7). - -autoconf (>= 2.13-20), automake1.7 - Try to get rid of them. - -doxygen, tetex-bin, tetex-extra, gs - for ndb/docs/*tex - -# -# Remarks to the start scripts -# - -## initscripts rely on mysqladmin from a different package -We have the problem that "/etc/init.d/mysql stop" relies on mysqladmin which -is in another package (mysql-client) and a passwordless access that's maybe -only available if the user configured his /root/.my.cnf. Can this be a problem? -* normal mode: not because the user is required to have it. Else: -* purge/remove: not, same as normal mode -* upgrade: not, same as normal mode -* first install: not, it depends on mysql-client which at least is unpacked - so mysqladmin is there (to ping). It is not yet configured - passwordles but if there's a server running then there's a - /root/.my.cnf. Anyways, we simply kill anything that's mysqld. - -## Passwordless access for the maintainer scripts -Another issue is that the scripts needs passwordless access. To ensure this -a debian-sys-maint user is configured which has process and shutdown privs. -The file with the randomly (that's important!) generated password must be -present as long as the databases remain installed because else a new install -would have no access. This file should be used like: - mysqladmin --defaults-file=/etc/mysql/debian.cnf restart -to avoid providing the password in plaintext on a commandline where it would -be visible to any user via the "ps" command. - -## When to start the daemon? -We aim to give the admin full control on when MySQL is running. -Issues to be faced here: -OLD: - 1. Debconf asks whether MySQL should be started on boot so update-rc.d is - only run if the answer has been yes. The admin is likely to forget - this decision but update-rc.d checks for an existing line in - /etc/runlevel.conf and leaves it intact. - 2. On initial install, if the answer is yes, the daemon has to be started. - 3. On upgrades it should only be started if it was already running, everything - else is confusing. Especiall relying on an debconf decision made month ago - is considered suboptimal. See bug #274264 - Implementation so far: - prerm (called on upgrade before stopping the server): - check for a running server and set flag if necessary - preinst (called on initial install and before unpacking when upgrading): - check for the debconf variable and set flag if necessary - postinst (called on initial install and after each upgrade after unpacking): - call update-rc.d if debconf says yes - call invoce-rc.d if the flag has been set - Problems remaining: - dpkg-reconfigure and setting mysql start on boot to yes did not start mysql - (ok "start on boot" literally does not mean "start now" so that might have been ok) -NEW: - 1. --- no debconf anymore for the sake of simplicity. We have runlevel.conf, - the admin should use it - 2. On initial install the server is started. - 3. On upgrades the server is started exactly if it was running before so the - runlevel configuration is irrelevant. It will be preserved by the mean of - update-rc.d's builtin check. - Implementation: - prerm (called on upgrade before stopping the server): - check for a running server and set flag if necessary - preinst (called on initial install and before unpacking when upgrading): - check for $1 beeing (initial) "install" and set flag - postinst (called on initial install and after each upgrade after unpacking): - call update-rc.d - call invoce-rc.d if the flag has been set diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index 1f8bc0209eb..d30ec182c8b 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -62,7 +62,7 @@ max_heap_table_size = 32M # # This replaces the startup script and checks MyISAM tables if needed # the first time they are touched. On error, make copy and try a repair. -myisam_recover = BACKUP +myisam_recover_options = BACKUP key_buffer_size = 128M #open-files-limit = 2000 table_open_cache = 400 @@ -156,11 +156,15 @@ innodb_flush_method = O_DIRECT # [galera] # Mandatory settings +#wsrep_on=ON #wsrep_provider= #wsrep_cluster_address= #binlog_format=row #default_storage_engine=InnoDB #innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# #bind-address=0.0.0.0 # # Optional setting @@ -173,7 +177,7 @@ quote-names max_allowed_packet = 16M [mysql] -#no-auto-rehash # faster start of mysql but no tab completition +#no-auto-rehash # faster start of mysql but no tab completion [isamchk] key_buffer = 16M diff --git a/debian/additions/mysql-server.lintian-overrides b/debian/additions/mysql-server.lintian-overrides deleted file mode 100644 index 9d741cf16e9..00000000000 --- a/debian/additions/mysql-server.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -W: mysql-dfsg source: maintainer-script-lacks-debhelper-token debian/mysql-server.postinst -W: mysql-server: possible-bashism-in-maintainer-script postinst:68 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' diff --git a/debian/additions/mysqlreport b/debian/additions/mysqlreport index 5cd46441d8a..3e116bf4a43 100755 --- a/debian/additions/mysqlreport +++ b/debian/additions/mysqlreport @@ -1,10 +1,11 @@ #!/usr/bin/perl -w -# mysqlreport v3.5 Apr 16 2008 +# mysqlreport v4.0 Oct 23 2015 # http://hackmysql.com/mysqlreport -# mysqlreport makes an easy-to-read report of important MySQL status values. +# mysqlreport makes an easy-to-read report of important MySQL/MariaDB status values. # Copyright 2006-2008 Daniel Nichter +# Copyright 2012-2015 Jean Weisbuch # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -36,16 +37,19 @@ my ($stat_name, $stat_val, $stat_label); my $MySQL_version; my (%stats, %vars); # SHOW STATUS, SHOW VARIABLES my (%DMS_vals, %Com_vals, %ib_vals); -my ($dbh, $query); +my $dbh; my ($questions, $key_read_ratio, $key_write_ratio, $dms, $slow_query_t); my ($key_cache_block_size, $key_buffer_used, $key_buffer_usage); my ($qc_mem_used, $qc_hi_r, $qc_ip_r); # Query Cache -my $have_innodb_vals; my ($ib_bp_used, $ib_bp_total, $ib_bp_read_ratio); my ($relative_live, $relative_infiles); my $real_uptime; my (%stats_present, %stats_past); # For relative reports - +my ($pagecache_read_ratio, $pagecache_write_ratio, $pagecache_block_size, $pagecache_buffer_used, $pagecache_buffer_usage); # AriaDB pagecache stats +my ($binlog_cache_ratio, $binlog_stmt_cache_ratio); # binary log cache +my $dbms; +my ($rows, $rows_using_indexes); + GetOptions ( \%op, "user=s", @@ -127,13 +131,19 @@ $| = 1 if ($op{'detach'} || $relative_live); print "tmp file: $tmpfile\n" if $op{debug}; -# Connect to MySQL +# Connect to MySQL/MariaDB if(!$op{'infile'} && !$relative_infiles) { connect_to_MySQL(); } -$have_innodb_vals = 1; # This might be set to 0 later in get_MySQL_version() +my $have_innodb_vals = 1; # This might be set to 0 later in get_MySQL_version() +my $have_aria_vals = 0; +my $have_subquerycache_vals = 0; +my $have_binlog_vals = 0; +my $have_tokudb_engine = 0; +my $use_thread_pool = 0; +my $use_xtradb = 0; if(defined $op{'r'}) { @@ -163,6 +173,9 @@ else set_myisam_vals(); set_ib_vals() if $have_innodb_vals; + set_aria_vals() if $have_aria_vals; + set_subquerycache_vals() if $have_subquerycache_vals; + set_binlog_vals() if $have_binlog_vals; write_report(); } @@ -177,8 +190,8 @@ exit; sub show_help_and_exit { print <<"HELP"; -mysqlreport v3.5 Apr 16 2008 -mysqlreport makes an easy-to-read report of important MySQL status values. +mysqlreport v4.0 Oct 23 2015 +mysqlreport makes an easy-to-read report of important MySQL/MariaDB status values. Command line options (abbreviations work): --user USER Connect to MySQL as USER @@ -264,6 +277,9 @@ sub collect_reports set_myisam_vals(); set_ib_vals() if $have_innodb_vals; + set_aria_vals() if $have_aria_vals; + set_subquerycache_vals() if $have_subquerycache_vals; + set_binlog_vals() if $have_binlog_vals; print "#\n# Beginning report, 0 0:0:0\n#\n"; @@ -403,6 +419,9 @@ sub relative_infile_report set_myisam_vals(); set_ib_vals() if $have_innodb_vals; + set_aria_vals() if $have_aria_vals; + set_subquerycache_vals() if $have_subquerycache_vals; + set_binlog_vals() if $have_binlog_vals; print "#\n# Beginning report, 0 0:0:0\n#\n"; @@ -422,7 +441,7 @@ sub get_vals { print "get_vals\n" if $op{debug}; - my @row; + my (@row, $query); # Get status values if($MySQL_version >= 50002) @@ -434,7 +453,9 @@ sub get_vals $query = $dbh->prepare("SHOW STATUS;"); } $query->execute(); - while(@row = $query->fetchrow_array()) { $stats{$row[0]} = $row[1]; } + # To avoid problems if the variable capitalization would change (eg. TokuDB on MariaDB 5.5 => 10.0), the $stats index is forced to have its first char uppercase and the rest lowercase + while(@row = $query->fetchrow_array()) { $stats{ucfirst(lc($row[0]))} = $row[1]; } + $query->finish(); $real_uptime = $stats{'Uptime'}; } @@ -443,18 +464,23 @@ sub get_vars { print "get_vars\n" if $op{debug}; - my @row; + my (@row, $query); # Get server system variables $query = $dbh->prepare("SHOW VARIABLES;"); $query->execute(); while(@row = $query->fetchrow_array()) { $vars{$row[0]} = $row[1]; } - + $query->finish(); # table_cache was renamed to table_open_cache in MySQL 5.1.3 if($MySQL_version >= 50103) { $vars{'table_cache'} = $vars{'table_open_cache'}; } + # log_slow_queries was renamed to slow_query_log in MySQL 5.1.29 + if($MySQL_version >= 50129) + { + $vars{'log_slow_queries'} = $vars{'slow_query_log'}; + } } sub read_infile @@ -507,10 +533,10 @@ sub read_infile else { print "read_infile: ignore '$_'\n" if $op{debug}; } last if $1 eq 'Uptime'; # exit while() if end of status values - $_ = <INFILE>; # otherwise, read next line of status values + $_ = <INFILE>; # otherwise, read next line of status values } } - elsif($1 eq 'back_log') # system variable values + elsif($1 eq 'back_log') # system variable values { print "read_infile: start vars\n" if $op{debug}; @@ -525,7 +551,7 @@ sub read_infile else { print "read_infile: ignore '$_'\n" if $op{debug}; } last if $1 eq 'wait_timeout'; # exit while() if end of vars - $_ = <INFILE>; # otherwise, read next line of vars + $_ = <INFILE>; # otherwise, read next line of vars } } elsif($1 eq '=') # old style, manually added system variable values @@ -542,7 +568,7 @@ sub read_infile } else { print "read_infile: ignore '$_'\n" if $op{debug}; } - $_ = <INFILE>; # otherwise, read next line of old vars + $_ = <INFILE>; # otherwise, read next line of old vars } redo; @@ -572,25 +598,116 @@ sub get_MySQL_version if($op{'infile'} || $relative_infiles) { - ($major, $minor, $patch) = ($vars{'version'} =~ /(\d{1,2})\.(\d{1,2})\.(\d{1,2})/); + ($major, $minor, $patch) = ($vars{'version'} =~ /^(\d{1,2})\.(\d{1,2})\.(\d{1,2})/); + if($vars{'version'} =~ /^\d{1,2}\.\d{1,2}\.\d{1,2}-MariaDB/) { + print "MariaDB detected\n" if $op{debug}; + $dbms = "MariaDB"; + } else { + $dbms = "MySQL"; + } } else { - my @row; + my (@row, $query); $query = $dbh->prepare("SHOW VARIABLES LIKE 'version';"); $query->execute(); @row = $query->fetchrow_array(); - ($major, $minor, $patch) = ($row[1] =~ /(\d{1,2})\.(\d{1,2})\.(\d{1,2})/); + $query->finish(); + ($major, $minor, $patch) = ($row[1] =~ /^(\d{1,2})\.(\d{1,2})\.(\d{1,2})/); + if($row[1] =~ /^\d{1,2}\.\d{1,2}\.\d{1,2}-MariaDB/) + { + print "MariaDB detected\n" if $op{debug}; + $dbms = "MariaDB"; + } + else + { + $dbms = "MySQL"; + } } + # The major version number is kept as is while the minor version and the revision number are forced to 2 digits + # e.g.: 5.5.9 will be 50509, 10.0.5 will be 100005 and 10.1.23 will be 100123 $MySQL_version = sprintf("%d%02d%02d", $major, $minor, $patch); + print "Version $MySQL_version\n" if $op{debug}; # Innodb_ status values were added in 5.0.2 if($MySQL_version < 50002) { $have_innodb_vals = 0; print "get_MySQL_version: no InnoDB reports because MySQL version is older than 5.0.2\n" if $op{debug}; + } else { + $have_innodb_vals = $dbh->selectall_arrayref("SELECT SUPPORT FROM information_schema.engines WHERE ENGINE = 'InnoDB';", undef)->[0][0]; + if(defined($have_innodb_vals) && ($have_innodb_vals eq "YES" || $have_innodb_vals eq "DEFAULT")) + { + print "InnoDB detected\n" if $op{debug}; + $have_innodb_vals = 1; + } else { + print "InnoDB is not activated\n" if $op{debug}; + $have_innodb_vals = 0; + } + } + + if($dbms eq "MariaDB") { + $have_aria_vals = $dbh->selectall_arrayref("SELECT SUPPORT FROM information_schema.engines WHERE ENGINE = 'Aria';", undef)->[0][0]; + if(defined($have_aria_vals) && $have_aria_vals eq "YES") + { + print "Aria engine detected\n" if $op{debug}; + $have_aria_vals = 1; + } else { + $have_aria_vals = 0; + } + + # MariaDB 5.3+, activated by default since 5.3.2 + $have_subquerycache_vals = $dbh->selectall_arrayref("SELECT VARIABLE_VALUE REGEXP ',subquery_cache=on,|^subquery_cache=on,|,subquery_cache=on\$' AS SUBQUERY_CACHE FROM information_schema.global_variables WHERE VARIABLE_NAME = 'optimizer_switch';", undef)->[0][0]; + if(defined($have_subquerycache_vals) && $have_subquerycache_vals eq "1") + { + print "Subquery cache is activated\n" if $op{debug}; + $have_subquerycache_vals = 1; + } else { + $have_subquerycache_vals = 0; + } + } + + if($MySQL_version >= 50000) + { + # These checks use the 'information_schema' virtual database that has been added on MySQL 5.0 + + # MariaDB 5.5.21+ and Percona Server 5.5.30+ use the same thread pool implementation + $use_thread_pool = $dbh->selectall_arrayref("SELECT VARIABLE_VALUE FROM information_schema.global_variables WHERE VARIABLE_NAME = 'thread_handling';", undef)->[0][0]; + if(defined($use_thread_pool) && $use_thread_pool eq "pool-of-threads") { + print "Thread pool is used\n" if $op{debug}; + $use_thread_pool = 1; + } else { + $use_thread_pool = 0; + } + + $have_binlog_vals = $dbh->selectall_arrayref("SELECT VARIABLE_VALUE FROM information_schema.global_variables WHERE VARIABLE_NAME = 'log_bin';", undef)->[0][0]; + if(defined($have_binlog_vals) && $have_binlog_vals eq "ON") + { + print "Binary log is activated\n" if $op{debug}; + $have_binlog_vals = 1; + } else { + $have_binlog_vals = 0; + } + + $have_tokudb_engine = $dbh->selectall_arrayref("SELECT SUPPORT FROM information_schema.engines WHERE ENGINE = 'TokuDB';", undef)->[0][0]; + if(defined($have_tokudb_engine) && ($have_tokudb_engine eq "YES" || $have_tokudb_engine eq "DEFAULT")) + { + print "TokuDB detected\n" if $op{debug}; + $have_tokudb_engine = 1; + } else { + $have_tokudb_engine = 0; + } + + $use_xtradb = $dbh->selectall_arrayref("SELECT 1 FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'InnoDB' AND COMMENT LIKE 'Percona-XtraDB%';", undef)->[0][0]; + if(defined($use_xtradb) && $use_xtradb eq "1") + { + print "XtraDB detected\n" if $op{debug}; + $use_xtradb = 1; + } else { + $use_xtradb = 0; + } } } @@ -598,6 +715,7 @@ sub set_myisam_vals { print "set_myisam_vals\n" if $op{debug}; +# should be moved elsewere $questions = $stats{'Questions'}; $key_read_ratio = sprintf "%.2f", @@ -638,7 +756,6 @@ sub set_myisam_vals $dms = $DMS_vals{SELECT} + $DMS_vals{INSERT} + $DMS_vals{REPLACE} + $DMS_vals{UPDATE} + $DMS_vals{DELETE}; $slow_query_t = format_u_time($vars{long_query_time}); - } sub set_ib_vals @@ -658,6 +775,46 @@ sub set_ib_vals 0); } +sub set_aria_vals +{ + print "set_aria_vals\n" if $op{debug}; + + $pagecache_read_ratio = sprintf "%.2f", + ($stats{'Aria_pagecache_read_requests'} ? + 100 - ($stats{'Aria_pagecache_reads'} / $stats{'Aria_pagecache_read_requests'}) * 100 : + 0); + + $pagecache_write_ratio = sprintf "%.2f", + ($stats{'Aria_pagecache_write_requests'} ? + 100 - ($stats{'Aria_pagecache_writes'} / $stats{'Aria_pagecache_write_requests'}) * 100 : + 0); + + $pagecache_block_size = (defined $vars{'aria_block_size'} ? + $vars{'aria_block_size'} : + 1024); + + $pagecache_buffer_used = $stats{'Aria_pagecache_blocks_used'} * $pagecache_block_size; + + $pagecache_buffer_usage = $vars{'aria_pagecache_buffer_size'} - + ($stats{'Aria_pagecache_blocks_unused'} * $pagecache_block_size); +} + +sub set_subquerycache_vals +{ + print "set_subquerycache_vals\n" if $op{debug}; +} + +sub set_binlog_vals +{ + print "set_binlog_vals\n" if $op{debug}; + + if($stats{'Binlog_cache_use'} gt 0) { $binlog_cache_ratio = $stats{'Binlog_cache_disk_use'} / $stats{'Binlog_cache_use'}; } + else { $binlog_cache_ratio = 0; } + + if(defined($stats{'Binlog_stmt_cache_use'}) && $stats{'Binlog_stmt_cache_use'} gt 0) { $binlog_stmt_cache_ratio = $stats{'Binlog_stmt_cache_disk_use'} / $stats{'Binlog_stmt_cache_use'}; } + else { $binlog_stmt_cache_ratio = 0; } +} + sub write_relative_report { print "write_relative_report\n" if $op{debug}; @@ -708,6 +865,10 @@ sub write_relative_report $stats{'Innodb_row_lock_time_max'} = $stats_present{'Innodb_row_lock_time_max'}; } } + if($have_aria_vals) + { + $stats{'Aria_pagecache_blocks_used'} = $stats_present{'Aria_pagecache_blocks_used'}; + } get_Com_values(); @@ -715,6 +876,9 @@ sub write_relative_report set_myisam_vals(); set_ib_vals() if $have_innodb_vals; + set_aria_vals() if $have_aria_vals; + set_subquerycache_vals() if $have_subquerycache_vals; + set_binlog_vals() if $have_binlog_vals; write_report(); } @@ -731,15 +895,27 @@ sub write_report $~ = 'SLOW_DMS', write; write_DMS(); write_Com(); + write_Rows(); $~ = 'SAS', write; write_qcache(); $~ = 'REPORT_END', write; + $~ = 'THREADS', write; + if($use_thread_pool) + { + $~ = 'THREADPOOL', write; + } else { + $~ = 'THREADPERCONNECTION', write; + } $~ = 'TAB', write; write_InnoDB() if $have_innodb_vals; + write_Aria() if $have_aria_vals; + write_Subquerycache() if $have_subquerycache_vals; + write_Binlog() if $have_binlog_vals; + write_TokuDB() if $have_tokudb_engine; } -sub sec_to_dhms # Seconds to days hours:minutes:seconds +sub sec_to_dhms # Seconds to days+hours:minutes:seconds { my $s = shift; my ($d, $h, $m) = (0, 0, 0); @@ -761,7 +937,7 @@ sub sec_to_dhms # Seconds to days hours:minutes:seconds $m = int $s / 60; $s -= $m * 60; - return "$d $h:$m:$s"; + return "$d+$h:$m:$s"; } sub make_short @@ -782,12 +958,11 @@ sub make_short } # What began as a simple but great idea has become the new standard: -# long_query_time in microseconds. For MySQL 5.1.21+ and 6.0.4+ this -# is now standard. For 4.1 and 5.0 patches, the architects of this -# idea provide: http://www.mysqlperformanceblog.com/mysql-patches/ +# long_query_time in microseconds. For MySQL 5.1.21+ this is now +# standard. For 4.1 and 5.0 patches, the architects of this idea +# provide: http://www.mysqlperformanceblog.com/mysql-patches/ # Relevant notes in MySQL manual: # http://dev.mysql.com/doc/refman/5.1/en/slow-query-log.html -# http://dev.mysql.com/doc/refman/6.0/en/slow-query-log.html # # The format_u_time sub simply beautifies long_query_time. @@ -848,7 +1023,7 @@ sub email_report # Email given report to $op{'email'} open SENDMAIL, "|/usr/sbin/sendmail -t"; print SENDMAIL "From: mysqlreport\n"; print SENDMAIL "To: $op{email}\n"; - print SENDMAIL "Subject: MySQL status report on " . ($mycnf{'host'} || 'localhost') . "\n\n"; + print SENDMAIL "Subject: $dbms status report on " . ($mycnf{'host'} || 'localhost') . "\n\n"; print SENDMAIL `cat $report`; close SENDMAIL; } @@ -979,6 +1154,7 @@ sub write_qcache # ergo this method is slightly more reliable return if not exists $vars{'query_cache_size'}; return if $vars{'query_cache_size'} == 0; + return if defined($vars{'query_cache_type'}) and $vars{'query_cache_type'} eq 'OFF'; $qc_mem_used = $vars{'query_cache_size'} - $stats{'Qcache_free_memory'}; $qc_hi_r = sprintf "%.2f", $stats{'Qcache_hits'} / ($stats{'Qcache_inserts'} ||= 1); @@ -988,6 +1164,36 @@ sub write_qcache write; } +sub write_Subquerycache +{ + print "write_Subquerycache\n" if $op{debug}; + + return if not defined $stats{'Subquery_cache_hit'}; + return if $stats{'Subquery_cache_hit'} == 0 && $stats{'Subquery_cache_miss'} == 0; + + $~ = 'SUBQUERYCACHE'; + write; +} + +sub write_Binlog +{ + print "write_Binlog\n" if $op{debug}; + + return if $binlog_cache_ratio == 0 && $binlog_stmt_cache_ratio == 0; + $~ = 'BINLOG'; + write; +} + +sub write_TokuDB +{ + print "write_TokuDB\n" if $op{debug}; + + return if $stats{'Tokudb_cachetable_size_current'} == 0; + + $~ = 'TOKUDB'; + write; +} + sub write_InnoDB { print "write_InnoDB\n" if $op{debug}; @@ -998,6 +1204,11 @@ sub write_InnoDB $~ = 'IB'; write; + if($use_xtradb) + { + $~ = 'IB_XTRADB'; + write; + } # Innodb_row_lock_ values were added in MySQL 5.0.3 if($MySQL_version >= 50003) @@ -1005,12 +1216,44 @@ sub write_InnoDB $~ = 'IB_LOCK'; write; } + if($use_xtradb) + { + $~ = 'IB_LOCK_XTRADB'; + write; + } # Data, Pages, Rows $~ = 'IB_DPR'; write; } + +sub write_Aria +{ + print "write_Aria\n" if $op{debug}; + + return if not defined $stats{'Aria_pagecache_blocks_used'}; + + $~ = 'PAGECACHE_BUFF_MAX'; + write; + + if($pagecache_buffer_usage != -1) { $~ = 'PAGECACHE_BUFF_USAGE', write } + + $~ = 'PAGECACHE_RATIOS'; + write; +} + +sub write_Rows +{ + print "write_Rows\n" if $op{debug}; + + $rows_using_indexes = $stats{'Handler_read_first'} + $stats{'Handler_read_key'} + $stats{'Handler_read_next'} + $stats{'Handler_read_prev'}; + $rows = $rows_using_indexes + $stats{'Handler_read_rnd'} + $stats{'Handler_read_rnd_next'} + $stats{'Sort_rows'}; + + $~ = 'ROWS'; + write; +} + sub have_op { my $key = shift; @@ -1043,19 +1286,17 @@ sub exit_tasks_and_cleanup } else { - if($WIN) { `del $tmpfile`; } - else { `rm -f $tmpfile`; } + unlink $tmpfile; } if(!$op{'infile'} && !$relative_infiles) { if($op{'flush-status'}) { - $query = $dbh->prepare("FLUSH STATUS;"); + my $query = $dbh->prepare("FLUSH STATUS;"); $query->execute(); + $query->finish(); } - - $query->finish(); $dbh->disconnect(); } } @@ -1065,19 +1306,19 @@ sub exit_tasks_and_cleanup # format MYSQL_TIME = -MySQL @<<<<<<<<<<<<<<<< uptime @<<<<<<<<<<< @>>>>>>>>>>>>>>>>>>>>>>>> -$vars{'version'}, sec_to_dhms($real_uptime), (($op{infile} || $relative_infiles) ? '' : scalar localtime) +@<<<<<< @<<<<<<<<<<<<<<<<<< uptime @<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<< +$dbms, $vars{'version'}, sec_to_dhms($real_uptime), (($op{infile} || $relative_infiles) ? '' : scalar localtime) . format KEY_BUFF_MAX = __ Key _________________________________________________________________ -Buffer used @>>>>>> of @>>>>>> %Used: @>>>>> +Buffer used @>>>>>> of @>>>>>> %Used: @>>>>> make_short($key_buffer_used, 1), make_short($vars{'key_buffer_size'}, 1), perc($key_buffer_used, $vars{'key_buffer_size'}) . format KEY_BUFF_USAGE = - Current @>>>>>> %Usage: @>>>>> + Current @>>>>>> %Usage: @>>>>> make_short($key_buffer_usage, 1), perc($key_buffer_usage, $vars{'key_buffer_size'}) . @@ -1088,166 +1329,197 @@ Read hit @>>>>>% $key_read_ratio __ Questions ___________________________________________________________ -Total @>>>>>>>> @>>>>>/s +Total @>>>>>>>> @>>>>>/s make_short($questions), t($questions) . format DTQ = - @<<<<<<< @>>>>>>>> @>>>>>/s @>>>>>> @>>>>> + @<<<<<<< @>>>>>>>> @>>>>>/s @>>>>>> @>>>>> $stat_name, make_short($stat_val), t($stat_val), $stat_label, perc($stat_val, $questions) . format SLOW_DMS = -Slow @<<<<<<< @>>>>>> @>>>>>/s @>>>>> %DMS: @>>>>> Log: @>> +Slow @<<<<<<< @>>>>>> @>>>>>/s @>>>>> %DMS: @>>>>> Log: @>> $slow_query_t, make_short($stats{'Slow_queries'}), t($stats{'Slow_queries'}), perc($stats{'Slow_queries'}, $questions), perc($stats{'Slow_queries'}, $dms), $vars{'log_slow_queries'} -DMS @>>>>>>>> @>>>>>/s @>>>>> +DMS @>>>>>>>> @>>>>>/s @>>>>> make_short($dms), t($dms), perc($dms, $questions) . format DMS = - @<<<<<<< @>>>>>>>> @>>>>>/s @>>>>> @>>>>> + @<<<<<<< @>>>>>>>> @>>>>>/s @>>>>> @>>>>> $stat_name, make_short($stat_val), t($stat_val), perc($stat_val, $questions), perc($stat_val, $dms) . format COM_1 = -Com_ @>>>>>>>> @>>>>>/s @>>>>> +Com_ @>>>>>>>> @>>>>>/s @>>>>> make_short($stat_val), t($stat_val), perc($stat_val, $questions) . format COM_2 = - @<<<<<<<<<< @>>>>>> @>>>>>/s @>>>>> + @<<<<<<<<<< @>>>>>> @>>>>>/s @>>>>> $stat_name, make_short($stat_val), t($stat_val), perc($stat_val, $questions) . format SAS = __ SELECT and Sort _____________________________________________________ -Scan @>>>>>> @>>>>/s %SELECT: @>>>>> +Scan @>>>>>> @>>>>>/s %SELECT: @>>>>> make_short($stats{'Select_scan'}), t($stats{'Select_scan'}), perc($stats{'Select_scan'}, $stats{'Com_select'}) -Range @>>>>>> @>>>>/s @>>>>> +Range @>>>>>> @>>>>>/s @>>>>> make_short($stats{'Select_range'}), t($stats{'Select_range'}), perc($stats{'Select_range'}, $stats{'Com_select'}) -Full join @>>>>>> @>>>>/s @>>>>> +Full join @>>>>>> @>>>>>/s @>>>>> make_short($stats{'Select_full_join'}), t($stats{'Select_full_join'}), perc($stats{'Select_full_join'}, $stats{'Com_select'}) -Range check @>>>>>> @>>>>/s @>>>>> +Range check @>>>>>> @>>>>>/s @>>>>> make_short($stats{'Select_range_check'}), t($stats{'Select_range_check'}), perc($stats{'Select_range_check'}, $stats{'Com_select'}) -Full rng join @>>>>>> @>>>>/s @>>>>> +Full rng join @>>>>>> @>>>>>/s @>>>>> make_short($stats{'Select_full_range_join'}), t($stats{'Select_full_range_join'}), perc($stats{'Select_full_range_join'}, $stats{'Com_select'}) -Sort scan @>>>>>> @>>>>/s +Sort scan @>>>>>> @>>>>>/s make_short($stats{'Sort_scan'}), t($stats{'Sort_scan'}) -Sort range @>>>>>> @>>>>/s +Sort range @>>>>>> @>>>>>/s make_short($stats{'Sort_range'}), t($stats{'Sort_range'}) -Sort mrg pass @>>>>>> @>>>>/s +Sort mrg pass @>>>>>> @>>>>>/s make_short($stats{'Sort_merge_passes'}), t($stats{'Sort_merge_passes'}) . format QCACHE = __ Query Cache _________________________________________________________ -Memory usage @>>>>>> of @>>>>>> %Used: @>>>>> +Memory usage @>>>>>> of @>>>>>> %Usage: @>>>>> make_short($qc_mem_used, 1), make_short($vars{'query_cache_size'}, 1), perc($qc_mem_used, $vars{'query_cache_size'}) Block Fragmnt @>>>>>% perc($stats{'Qcache_free_blocks'}, $stats{'Qcache_total_blocks'}) -Hits @>>>>>> @>>>>/s +Hits @>>>>>> @>>>>>/s make_short($stats{'Qcache_hits'}), t($stats{'Qcache_hits'}) -Inserts @>>>>>> @>>>>/s +Inserts @>>>>>> @>>>>>/s make_short($stats{'Qcache_inserts'}), t($stats{'Qcache_inserts'}) -Insrt:Prune @>>>>>>:1 @>>>>/s +Insrt:Prune @>>>>>>:1 @>>>>>/s make_short($qc_ip_r), t($stats{'Qcache_inserts'} - $stats{'Qcache_lowmem_prunes'}) Hit:Insert @>>>>>>:1 $qc_hi_r, t($qc_hi_r) . +format SUBQUERYCACHE = + +__ Subquery Cache ______________________________________________________ +Hit ratio @>>>>>% +perc($stats{'Subquery_cache_hit'} / ($stats{'Subquery_cache_hit'} + $stats{'Subquery_cache_miss'})) +Hits @>>>>>> @>>>>>/s +make_short($stats{'Subquery_cache_hit'}), t($stats{'Subquery_cache_hit'}) +Miss @>>>>>> @>>>>>/s +make_short($stats{'Subquery_cache_miss'}), t($stats{'Subquery_cache_miss'}) +. + # Not really the end... format REPORT_END = __ Table Locks _________________________________________________________ -Waited @>>>>>>>> @>>>>>/s %Total: @>>>>> +Waited @>>>>>>>> @>>>>>/s %Total: @>>>>> make_short($stats{'Table_locks_waited'}), t($stats{'Table_locks_waited'}), perc($stats{'Table_locks_waited'}, $stats{'Table_locks_waited'} + $stats{'Table_locks_immediate'}); -Immediate @>>>>>>>> @>>>>>/s +Immediate @>>>>>>>> @>>>>>/s make_short($stats{'Table_locks_immediate'}), t($stats{'Table_locks_immediate'}) __ Tables ______________________________________________________________ -Open @>>>>>>>> of @>>> %Cache: @>>>>> +Open @>>>>>>>> of @>>>>> %Cache: @>>>>> $stats{'Open_tables'}, $vars{'table_cache'}, perc($stats{'Open_tables'}, $vars{'table_cache'}) -Opened @>>>>>>>> @>>>>>/s +Opened @>>>>>>>> @>>>>>/s make_short($stats{'Opened_tables'}), t($stats{'Opened_tables'}) __ Connections _________________________________________________________ -Max used @>>>>>>>> of @>>> %Max: @>>>>> +Max used @>>>>>>>> of @>>>>> %Max: @>>>>> $stats{'Max_used_connections'}, $vars{'max_connections'}, perc($stats{'Max_used_connections'}, $vars{'max_connections'}) -Total @>>>>>>>> @>>>>>/s +Total @>>>>>>>> @>>>>>/s make_short($stats{'Connections'}), t($stats{'Connections'}) __ Created Temp ________________________________________________________ -Disk table @>>>>>>>> @>>>>>/s -make_short($stats{'Created_tmp_disk_tables'}), t($stats{'Created_tmp_disk_tables'}) -Table @>>>>>>>> @>>>>>/s Size: @>>>>> +Disk table @>>>>>>>> @>>>>>/s %Disk: @>>>>> +make_short($stats{'Created_tmp_disk_tables'}), t($stats{'Created_tmp_disk_tables'}), perc($stats{'Created_tmp_disk_tables'}, $stats{'Created_tmp_tables'}) +Table @>>>>>>>> @>>>>>/s Size: @>>>>> make_short($stats{'Created_tmp_tables'}), t($stats{'Created_tmp_tables'}), make_short($vars{'tmp_table_size'}, 1, 1) -File @>>>>>>>> @>>>>>/s +File @>>>>>>>> @>>>>>/s make_short($stats{'Created_tmp_files'}), t($stats{'Created_tmp_files'}) . -format TAB = +format THREADS = __ Threads _____________________________________________________________ -Running @>>>>>>>> of @>>> +Running @>>>>>>>> of @>>>>> $stats{'Threads_running'}, $stats{'Threads_connected'} -Cached @>>>>>>>> of @>>> %Hit: @>>>>> -$stats{'Threads_cached'}, $vars{'thread_cache_size'}, make_short(100 - perc($stats{'Threads_created'}, $stats{'Connections'})) -Created @>>>>>>>> @>>>>>/s +Created @>>>>>>>> @>>>>>/s make_short($stats{'Threads_created'}), t($stats{'Threads_created'}) -Slow @>>>>>>>> @>>>>>/s +Slow @>>>>>>>> @>>>>>/s $stats{'Slow_launch_threads'}, t($stats{'Slow_launch_threads'}) +. + +format THREADPERCONNECTION = +Cached @>>>>>>>> of @>>>>> %Hit: @>>>>> +$stats{'Threads_cached'}, $vars{'thread_cache_size'}, make_short(100 - perc($stats{'Threads_created'}, $stats{'Connections'})) +. + +format THREADPOOL = +Threadpool @>>>>>>>> of @>>>>> %Used: @>>>>> +$stats{'Threadpool_threads'} + $stats{'Threadpool_idle_threads'}, $vars{'thread_pool_max_threads'}, make_short(perc($stats{'Threadpool_threads'} + $stats{'Threadpool_idle_threads'}, $vars{'thread_pool_max_threads'})) + Running @>>>>>>>> of @>>>>> %Running: @>>>>> +$stats{'Threadpool_threads'}, $vars{'thread_pool_max_threads'}, make_short(perc($stats{'Threadpool_threads'}, $vars{'thread_pool_max_threads'})) + Idle @>>>>>>>> of @>>>>> %Idle: @>>>>> +$stats{'Threadpool_idle_threads'}, $vars{'thread_pool_max_threads'}, make_short(perc($stats{'Threadpool_idle_threads'}, $vars{'thread_pool_max_threads'})) +. + +format TAB = __ Aborted _____________________________________________________________ -Clients @>>>>>>>> @>>>>>/s +Clients @>>>>>>>> @>>>>>/s make_short($stats{'Aborted_clients'}), t($stats{'Aborted_clients'}) -Connects @>>>>>>>> @>>>>>/s +Connects @>>>>>>>> @>>>>>/s make_short($stats{'Aborted_connects'}), t($stats{'Aborted_connects'}) __ Bytes _______________________________________________________________ -Sent @>>>>>>>> @>>>>>/s +Sent @>>>>>>>> @>>>>>/s make_short($stats{'Bytes_sent'}), t($stats{'Bytes_sent'}) -Received @>>>>>>>> @>>>>>/s +Received @>>>>>>>> @>>>>>/s make_short($stats{'Bytes_received'}), t($stats{'Bytes_received'}) . format IB = __ InnoDB Buffer Pool __________________________________________________ -Usage @>>>>>> of @>>>>>> %Used: @>>>>> +Usage @>>>>>> of @>>>>>> %Usage: @>>>>> make_short($ib_bp_used, 1), make_short($ib_bp_total, 1), perc($ib_bp_used, $ib_bp_total) Read hit @>>>>>% $ib_bp_read_ratio; Pages - Free @>>>>>>>> %Total: @>>>>> + Free @>>>>>>>> %Total: @>>>>> make_short($stats{'Innodb_buffer_pool_pages_free'}), perc($stats{'Innodb_buffer_pool_pages_free'}, $stats{'Innodb_buffer_pool_pages_total'}) - Data @>>>>>>>> @>>>>> %Drty: @>>>>> + Data @>>>>>>>> @>>>>> %Drty: @>>>>> make_short($stats{'Innodb_buffer_pool_pages_data'}), perc($stats{'Innodb_buffer_pool_pages_data'}, $stats{'Innodb_buffer_pool_pages_total'}), perc($stats{'Innodb_buffer_pool_pages_dirty'}, $stats{'Innodb_buffer_pool_pages_data'}) - Misc @>>>>>>>> @>>>>> + Misc @>>>>>>>> @>>>>> $stats{'Innodb_buffer_pool_pages_misc'}, perc($stats{'Innodb_buffer_pool_pages_misc'}, $stats{'Innodb_buffer_pool_pages_total'}) - Latched @>>>>>>>> @>>>>> + Latched @>>>>>>>> @>>>>> $stats{'Innodb_buffer_pool_pages_latched'}, perc($stats{'Innodb_buffer_pool_pages_latched'}, $stats{'Innodb_buffer_pool_pages_total'}) -Reads @>>>>>>>> @>>>>>/s +Reads @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_buffer_pool_read_requests'}), t($stats{'Innodb_buffer_pool_read_requests'}) - From file @>>>>>>>> @>>>>>/s @>>>>> + From disk @>>>>>>>> @>>>>>/s %Disk: @>>>>> make_short($stats{'Innodb_buffer_pool_reads'}), t($stats{'Innodb_buffer_pool_reads'}), perc($stats{'Innodb_buffer_pool_reads'}, $stats{'Innodb_buffer_pool_read_requests'}) - Ahead Rnd @>>>>>>>> @>>>>>/s + Ahead Rnd @>>>>>>>> @>>>>>/s $stats{'Innodb_buffer_pool_read_ahead_rnd'}, t($stats{'Innodb_buffer_pool_read_ahead_rnd'}) - Ahead Sql @>>>>>>>> @>>>>>/s -$stats{'Innodb_buffer_pool_read_ahead_seq'}, t($stats{'Innodb_buffer_pool_read_ahead_seq'}) -Writes @>>>>>>>> @>>>>>/s +# Ahead Sql @>>>>>>>> @>>>>>/s +#$stats{'Innodb_buffer_pool_read_ahead_seq'}, t($stats{'Innodb_buffer_pool_read_ahead_seq'}) +Writes @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_buffer_pool_write_requests'}), t($stats{'Innodb_buffer_pool_write_requests'}) -Flushes @>>>>>>>> @>>>>>/s +Wait Free @>>>>>>>> @>>>>>/s %Wait: @>>>>> +$stats{'Innodb_buffer_pool_wait_free'}, t($stats{'Innodb_buffer_pool_wait_free'}), perc($stats{'Innodb_buffer_pool_wait_free'}, $stats{'Innodb_buffer_pool_write_requests'}) +Flushes @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_buffer_pool_pages_flushed'}), t($stats{'Innodb_buffer_pool_pages_flushed'}) -Wait Free @>>>>>>>> @>>>>>/s -$stats{'Innodb_buffer_pool_wait_free'}, t($stats{'Innodb_buffer_pool_wait_free'}) +. + +format IB_XTRADB = + LRU @>>>>>>>> @>>>>>/s %LRU: @>>>>> +make_short($stats{'Innodb_buffer_pool_pages_lru_flushed'}), t($stats{'Innodb_buffer_pool_pages_lru_flushed'}), perc($stats{'Innodb_buffer_pool_pages_lru_flushed'}, $stats{'Innodb_buffer_pool_pages_flushed'}) . format IB_LOCK = __ InnoDB Lock _________________________________________________________ -Waits @>>>>>>>> @>>>>>/s +Waits @>>>>>>>> @>>>>>/s $stats{'Innodb_row_lock_waits'}, t($stats{'Innodb_row_lock_waits'}) Current @>>>>>>>> $stats{'Innodb_row_lock_current_waits'} @@ -1260,15 +1532,20 @@ $stats{'Innodb_row_lock_time_avg'} $stats{'Innodb_row_lock_time_max'} . +format IB_LOCK_XTRADB = +Trx history @>>>>>>>> +make_short($stats{'Innodb_history_list_length'}) +. + format IB_DPR = __ InnoDB Data, Pages, Rows ____________________________________________ Data - Reads @>>>>>>>> @>>>>>/s + Reads @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_data_reads'}), t($stats{'Innodb_data_reads'}) - Writes @>>>>>>>> @>>>>>/s + Writes @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_data_writes'}), t($stats{'Innodb_data_writes'}) - fsync @>>>>>>>> @>>>>>/s + fsync @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_data_fsyncs'}), t($stats{'Innodb_data_fsyncs'}) Pending Reads @>>>>>>>> @@ -1279,20 +1556,71 @@ $stats{'Innodb_data_pending_writes'}, t($stats{'Innodb_data_pending_writes'}) $stats{'Innodb_data_pending_fsyncs'}, t($stats{'Innodb_data_pending_fsyncs'}) Pages - Created @>>>>>>>> @>>>>>/s + Created @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_pages_created'}), t($stats{'Innodb_pages_created'}) - Read @>>>>>>>> @>>>>>/s + Read @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_pages_read'}), t($stats{'Innodb_pages_read'}) - Written @>>>>>>>> @>>>>>/s + Written @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_pages_written'}), t($stats{'Innodb_pages_written'}) Rows - Deleted @>>>>>>>> @>>>>>/s + Deleted @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_rows_deleted'}), t($stats{'Innodb_rows_deleted'}) - Inserted @>>>>>>>> @>>>>>/s + Inserted @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_rows_inserted'}), t($stats{'Innodb_rows_inserted'}) - Read @>>>>>>>> @>>>>>/s + Read @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_rows_read'}), t($stats{'Innodb_rows_read'}) - Updated @>>>>>>>> @>>>>>/s + Updated @>>>>>>>> @>>>>>/s make_short($stats{'Innodb_rows_updated'}), t($stats{'Innodb_rows_updated'}) . + +format PAGECACHE_BUFF_MAX = + +__ Aria Pagecache ______________________________________________________ +Buffer used @>>>>>> of @>>>>>> %Used: @>>>>> +make_short($pagecache_buffer_used, 1), make_short($vars{'aria_pagecache_buffer_size'}, 1), perc($pagecache_buffer_used, $vars{'aria_pagecache_buffer_size'}) +. + +format PAGECACHE_BUFF_USAGE = + Current @>>>>>> %Usage: @>>>>> +make_short($pagecache_buffer_usage, 1), perc($pagecache_buffer_usage, $vars{'aria_pagecache_buffer_size'}) +. + +format PAGECACHE_RATIOS = +Write hit @>>>>>% +$pagecache_write_ratio +Read hit @>>>>>% +$pagecache_read_ratio +. + +format BINLOG = + +__ Binary Log Cache _____________________________________________________ +Disk use + Transactional @>>>>>% +perc($binlog_cache_ratio) + Non transactional @>>>>>% +perc($binlog_stmt_cache_ratio) +. + +format TOKUDB = + +__ TokuDB ______________________________________________________________ +Cachetable @>>>>>> of @>>>>>> %Usage: @>>>>> +make_short($stats{Tokudb_cachetable_size_current}, 1), make_short($vars{tokudb_cache_size}, 1), perc($stats{Tokudb_cachetable_size_current}, $vars{tokudb_cache_size}) + Miss @>>>>>> @>>>>>/s +make_short($stats{'Tokudb_cachetable_miss'}), t($stats{'Tokudb_cachetable_miss'}) + Evictions @>>>>>> @>>>>>/s +make_short($stats{'Tokudb_cachetable_evictions'}), t($stats{'Tokudb_cachetable_evictions'}) +. + +format ROWS = + +__ Rows ________________________________________________________________ +Rows @>>>>>>>> @>>>>>/s +make_short($rows), t($rows) + Using idx @>>>>>>>> @>>>>>/s %Index: @>>>>> +make_short($rows_using_indexes), t($rows_using_indexes), perc($rows_using_indexes,$rows) +Rows/question @>>>>>> +make_short($rows/$questions) +. diff --git a/debian/dist/Ubuntu/apparmor-profile b/debian/apparmor-profile index 4ffb7eab550..4ffb7eab550 100644 --- a/debian/dist/Ubuntu/apparmor-profile +++ b/debian/apparmor-profile diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index bb14057b43b..f304e984b54 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -15,7 +15,7 @@ set -e # Buildbot, running the test suite from installed .debs on a clean VM. export DEB_BUILD_OPTIONS="nocheck" -#export MARIADB_OPTIONAL_DEBS="tokudb-engine" +export MARIADB_OPTIONAL_DEBS="" # Find major.minor version. # @@ -28,45 +28,21 @@ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" # Look up distro-version specific stuff. -# -# Libreadline changed to GPLv3. Old GPLv2 version is available, but it -# is called different things on different versions. + CODENAME="$(lsb_release -sc)" -case "${CODENAME}" in - etch) LIBREADLINE_DEV=libreadline-dev ;; - lenny|hardy|intrepid|jaunty|karmic|lucid) LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;; - squeeze|maverick|natty) LIBREADLINE_DEV=libreadline5-dev ;; - *) LIBREADLINE_DEV=libreadline-gplv2-dev ;; -esac - -sed -i -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" debian/control - -case "${CODENAME}" in - etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;; - *) CMAKE_DEP='cmake (>= 2.7), ' ;; -esac - -sed -i -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" debian/control - -# Clean up build file symlinks that are distro-specific. First remove all, then set -# new links. -DISTRODIRS="$(ls ./debian/dist)" -for distrodir in ${DISTRODIRS}; do - DISTROFILES="$(ls ./debian/dist/${distrodir})" - for distrofile in ${DISTROFILES}; do - rm -f "./debian/${distrofile}"; - done; -done; - -# Set no symlinks for build files in the debian dir, so we avoid adding AppArmor on Debian. -DISTRO="$(lsb_release -si)" -echo "Copying distribution specific build files for ${DISTRO}" -DISTROFILES="$(ls ./debian/dist/${DISTRO})" -for distrofile in ${DISTROFILES}; do - rm -f "./debian/${distrofile}" - cat "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}" - chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}" -done; + +# add libcrack2 (>= 2.9.0) as a build dependency +# but only where the distribution can possibly satisfy it +if apt-cache madison cracklib2|grep 'cracklib2 *| *2\.[0-8]\.' >/dev/null 2>&1 +then + # Anything in MARIADB_OPTIONAL_DEBS is omitted from the resulting + # packages by snipped in rules file + MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.1" + sed -i -e "/\\\${MAYBE_LIBCRACK}/d" debian/control +else + MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0),' + sed -i -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g" debian/control +fi # Adjust changelog, add new version. # diff --git a/debian/changelog b/debian/changelog index b22466b6277..4d0d74b12c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mariadb-10.1 (10.1.0) unstable; urgency=low + + * Initial release. + + -- Sergei Golubchik <serg@askmonty.org> Fri, 23 May 2014 09:44:38 -0200 + mariadb-10.0 (10.0.0) unstable; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 4b252f95eb0..218f9544e46 100644 --- a/debian/control +++ b/debian/control @@ -1,55 +1,301 @@ -Source: mariadb-10.0 -Section: misc +Source: mariadb-10.1 +Section: database Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> -XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net> Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> Build-Depends: bison, chrpath, + cmake (>= 2.7), debhelper, + dh-apparmor, dpatch, - gawk, - hardening-wrapper, - libjemalloc-dev (>= 3.0.0), - libncurses5-dev (>= 5.0-6), + libaio-dev, + libboost-dev, + libjudy-dev, + libkrb5-dev, + libncurses5-dev (>= 5.0-6~), libpam0g-dev, + libreadline-gplv2-dev, libssl-dev, - libwrap0-dev (>= 7.6-8.3), lsb-release, perl (>= 5.6.0), po-debconf, - procps | hurd, psmisc, - zlib1g-dev (>= 1:1.1.3-5), - ${CMAKE_DEP}libaio-dev, - ${LIBREADLINE_DEV} -Standards-Version: 3.8.3 + zlib1g-dev (>= 1:1.1.3-5~), + ${MAYBE_LIBCRACK} + libjemalloc-dev (>= 3.0.0~) [linux-any] +Standards-Version: 3.8.2 Homepage: http://mariadb.org/ -Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files -Vcs-Bzr: bzr://lp:maria +Vcs-Git: https://github.com/MariaDB/server.git +Vcs-Browser: https://github.com/MariaDB/server/ -Package: mariadb-galera-test-10.0 -Section: database +Package: libmariadbclient18 +Architecture: any +Section: libs +Depends: libmysqlclient18 (= ${source:Version}), + mariadb-common, + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), + mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-10.0 (<< 10.0.5), + mariadb-server-5.1, + mariadb-server-5.2, + mariadb-server-5.3, + mariadb-server-5.5 (<< 5.5.33) +Description: MariaDB database client library + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client library. + +Package: libmysqlclient18 +Section: libs +Architecture: any +Depends: libmariadbclient18 (= ${source:Version}) +Replaces: libmysqlclient18 (<< ${source:Version}) +Description: Virtual package to satisfy external depends + This is an empty package that provides an updated "best" version of + libmysqlclient18 that does not conflict with the libmariadbclient18 + package. + . + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + +Package: libmariadbd-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} +Provides: libmysqld-dev +Conflicts: libmysqld-dev +Replaces: libmysqld-dev +Description: MariaDB embedded database, development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the embedded server library and header files. + +Package: libmariadbclient-dev +Architecture: any +Section: libdevel +Depends: libmariadbclient18 (>= ${source:Version}), + zlib1g-dev, + ${misc:Depends}, + ${shlibs:Depends} +Replaces: libmariadbclient16-dev, libmysqlclient16-dev +Conflicts: libmariadbclient16-dev, + libmysqlclient-dev, + libmysqlclient10-dev, + libmysqlclient12-dev, + libmysqlclient14-dev, + libmysqlclient15-dev, + libmysqlclient16-dev +Provides: libmysqlclient-dev +Description: MariaDB database development files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes development libraries and header files. + +Package: mysql-common +Architecture: all +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/my.cnf). + +Package: mariadb-common +Architecture: all +Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends} +Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes files needed by all versions of the client library + (e.g. /etc/mysql/conf.d/mariadb.cnf). + +Package: mariadb-client-core-10.1 +Architecture: any +Depends: libmariadbclient18 (>= ${source:Version}), + mariadb-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Provides: mysql-client-core, + mysql-client-core-5.1, + mysql-client-core-5.5, + mysql-client-core-5.6, + virtual-mysql-client-core +Conflicts: mariadb-client-10.0, + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mariadb-client-core-10.0, + mariadb-client-core-5.1, + mariadb-client-core-5.2, + mariadb-client-core-5.3, + mariadb-client-core-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1 (<< ${source:Version}), + mysql-client-5.5 (<< ${source:Version}), + mysql-client-core-5.1, + mysql-client-core-5.5, + mysql-client-core-5.6, + virtual-mysql-client-core +Replaces: mariadb-client-10.0, + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mariadb-client-core-10.0, + mariadb-client-core-5.1, + mariadb-client-core-5.2, + mariadb-client-core-5.3, + mariadb-client-core-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-core-5.1, + mysql-client-core-5.5, + mysql-client-core-5.6, + virtual-mysql-client-core +Description: MariaDB database core client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core client files, as used by Akonadi. + +Package: mariadb-client-10.1 Architecture: any -Depends: mariadb-galera-server-10.0 (= ${source:Version}), - mariadb-client-10.0 (>= ${source:Version}) +Depends: debianutils (>=1.6), + libdbd-mysql-perl (>= 1.2202), + libdbi-perl, + libmariadbclient18 (>= ${source:Version}), + mariadb-client-core-10.1 (>= ${source:Version}), + mariadb-common, + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} +Suggests: libterm-readkey-perl +Provides: mysql-client, + mysql-client-4.1, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-client +Conflicts: mariadb-client (<< ${source:Version}), + mariadb-client-10.0, + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-client +Replaces: mariadb-client (<< ${source:Version}), + mariadb-client-10.0, + mariadb-client-5.1, + mariadb-client-5.2, + mariadb-client-5.3, + mariadb-client-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5, + mysql-client-5.6, + virtual-mysql-client +Description: MariaDB database client binaries + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the client binaries and the additional tools + innotop and mysqlreport. + +Package: mariadb-server-core-10.1 +Architecture: any +Depends: libmariadbclient18 (>= ${binary:Version}), + mariadb-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Provides: mysql-server-core, + mysql-server-core-5.1, + mysql-server-core-5.5, + mysql-server-core-5.6, + virtual-mysql-server-core +Conflicts: mariadb-server-core-10.0, + mariadb-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, + mysql-server-5.0, + mysql-server-core-5.0, + mysql-server-core-5.1, + mysql-server-core-5.5, + mysql-server-core-5.6, + virtual-mysql-server-core +Replaces: mariadb-server-core-10.0, + mariadb-server-core-5.1, + mariadb-server-core-5.2, + mariadb-server-core-5.3, + mariadb-server-core-5.5, + mysql-server-5.0, + mysql-server-core-5.0, + mysql-server-core-5.1, + mysql-server-core-5.5, + mysql-server-core-5.6, + virtual-mysql-server-core +Description: MariaDB database core server files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the core server files, as used by Akonadi. + +Package: mariadb-test-10.1 +Architecture: any +Depends: mariadb-client-10.1 (= ${binary:Version}), + mariadb-server-10.1 (= ${binary:Version}) Suggests: patch -Conflicts: mariadb-test, - mariadb-galera-test (<< ${source:Version}), +Conflicts: mariadb-galera-server-5.5 (<< 5.5.33), + mariadb-server-5.5 (<< 5.5.33), + mariadb-test (<< ${source:Version}), + mariadb-test-10.0, mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-test-5.5, - mariadb-test-10.0, - mariadb-server-5.5, - mariadb-galera-server-5.5, - mariadb-server-10.0 + virtual-mysql-testsuite Replaces: mariadb-test (<< ${source:Version}), - mariadb-galera-test (<< ${source:Version}), + mariadb-test-10.0, mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, - mariadb-test-5.5 + virtual-mysql-testsuite +Provides: virtual-mysql-testsuite Description: MariaDB database regression test suite MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -58,40 +304,33 @@ Description: MariaDB database regression test suite . This package includes the regression test suite. -Package: mariadb-galera-server-10.0 +Package: mariadb-server-10.1 Architecture: any -Suggests: mailx, mariadb-galera-test, tinyca, netcat-openbsd, socat +Suggests: mailx, mariadb-test, netcat-openbsd, socat, tinyca Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: bsdutils, - libdbi-perl, - lsb-base (>= 3.0-10), - mariadb-client-10.0 (>= ${source:Version}), - passwd, - perl (>= 5.6), - psmisc, - ${misc:Depends}, - ${shlibs:Depends}, - libmariadbclient18 (>= ${binary:Version}), coreutils, findutils, galera-3 (>=25.3), gawk, grep, iproute, + libdbi-perl, + lsb-base (>= 3.0-10), lsof, + mariadb-client-10.1 (>= ${source:Version}), + mariadb-server-core-10.1 (>= ${binary:Version}), + passwd, + perl (>= 5.6), + psmisc, rsync, - tar -Provides: mariadb-server, - mariadb-galera-server, - mysql-server, - virtual-mysql-server, - mysql-server-core, - mysql-server-core-5.1, - mysql-server-core-5.5, - mysql-server-core-10.0 -Conflicts: mariadb-galera-server (<< ${source:Version}), - mariadb-server, + tar, + ${misc:Depends}, + ${shlibs:Depends} +Provides: mariadb-server, mysql-server, virtual-mysql-server +Conflicts: mariadb-server (<< ${source:Version}), + mariadb-server-10.0, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, @@ -104,39 +343,25 @@ Conflicts: mariadb-galera-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.5, mysql-server-5.6, - mariadb-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.5, - mariadb-server-core-10.0, - mysql-server-core-5.0, - mysql-server-core-5.1, - mysql-server-core-5.5, - mysql-server-core-5.6 + virtual-mysql-server Replaces: libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), - mariadb-galera-server (<< ${source:Version}), - mariadb-server, + mariadb-server (<< ${source:Version}), + mariadb-server-10.0, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5, mariadb-tokudb-engine-10.0, mariadb-tokudb-engine-5.5, - mysql-server, + mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, mysql-server-5.6, - mariadb-server-core-5.1, - mariadb-server-core-5.2, - mariadb-server-core-5.5, - mariadb-server-core-10.0, - mysql-server-core-5.0, - mysql-server-core-5.1, - mysql-server-core-5.5, - mysql-server-core-5.6 -Description: MariaDB database server with Galera cluster binaries + virtual-mysql-server +Description: MariaDB database server binaries MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MariaDB are speed, robustness and @@ -144,14 +369,13 @@ Description: MariaDB database server with Galera cluster binaries . This package includes the server binaries. -Package: mariadb-galera-server -Section: database +Package: mariadb-server Architecture: all -Depends: mariadb-galera-server-10.0 (= ${source:Version}), ${misc:Depends} -Description: MariaDB database server with Galera cluster (metapackage depending on the latest version) +Depends: mariadb-server-10.1 (= ${source:Version}), ${misc:Depends} +Description: MariaDB database server (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-galera-server (currently mariadb-galera-server-10.0), as determined by the MariaDB - maintainers. Install this package if in doubt about which MariaDB-Galera + mariadb-server (currently mariadb-server-10.1), as determined by the MariaDB + maintainers. Install this package if in doubt about which MariaDB version you need. That will install the version recommended by the package maintainers. . @@ -161,20 +385,60 @@ Description: MariaDB database server with Galera cluster (metapackage depending ease of use. Package: mariadb-client -Section: database Architecture: all -Depends: mariadb-client-10.0 (= ${source:Version}), ${misc:Depends} +Depends: mariadb-client-10.1 (= ${source:Version}), ${misc:Depends} Description: MariaDB database client (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-client (currently mariadb-client-10.0), as determined by the MariaDB + mariadb-client (currently mariadb-client-10.1), as determined by the MariaDB maintainers. Install this package if in doubt about which MariaDB version - you want, as this is the one we consider to be in the best shape. + you want, as this is the one considered to be in the best shape. -Package: mariadb-galera-test -Section: database +Package: mariadb-test Architecture: all -Depends: mariadb-galera-test-10.0 (= ${source:Version}) -Description: MariaDB database regression test suite (metapackage depending on the latest version) +Depends: mariadb-test-10.1 (= ${source:Version}), ${misc:Depends} +Description: MariaDB database regression test suite (metapackage for the latest version) This is an empty package that depends on the current "best" version of - mariadb-galera-test (currently mariadb-galera-test-10.0), as determined by the MariaDB - maintainers.
\ No newline at end of file + mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB + maintainers. + +Package: mariadb-connect-engine-10.1 +Architecture: any +Depends: libxml2, mariadb-server-10.1, unixODBC +Build-Depends: libxml2-dev, + mariadb-server-10.1, + unixODBC-dev, + ${misc:Depends}, + ${shlibs:Depends} +Description: Connect storage engine for MariaDB + Connect engine supports a number of file formats (dbf, xml, txt, bin, etc), + connections to ODBC tables and remote MySQL tables, as well as a number of + other interesting features. + This package contains the Connect plugin for MariaDB. + +Package: mariadb-oqgraph-engine-10.1 +Architecture: any +Depends: libjudydebian1, mariadb-server-10.1, ${misc:Depends}, ${shlibs:Depends} +Description: OQGraph storage engine for MariaDB + The OQGraph engine is a computation engine plugin for handling hierarchies + (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL. + This package contains the OQGraph plugin for MariaDB. + +Package: mariadb-cracklib-password-check-10.1 +Section: database +Architecture: any +Depends: libcrack2 (>= 2.9.0), mariadb-server-10.1 +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. + +Package: mariadb-gssapi-server-10.1 +Section: database +Architecture: any +Depends: libgssapi-krb5-2, mariadb-server-10.1 +Description: GSSAPI authentication plugin for MariaDB server + +Package: mariadb-gssapi-client-10.1 +Section: database +Architecture: any +Depends: libgssapi-krb5-2, mariadb-client-10.1 +Description: GSSAPI authentication plugin for MariaDB client diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.README.Debian b/debian/dist/Debian/mariadb-galera-server-10.0.README.Debian deleted file mode 100644 index f398f2fa236..00000000000 --- a/debian/dist/Debian/mariadb-galera-server-10.0.README.Debian +++ /dev/null @@ -1,109 +0,0 @@ -* MYSQL WON'T START OR STOP?: -============================= -You may never ever delete the special mysql user "debian-sys-maint". This -user together with the credentials in /etc/mysql/debian.cnf are used by the -init scripts to stop the server as they would require knowledge of the mysql -root users password else. -So in most of the times you can fix the situation by making sure that the -debian.cnf file contains the right password, e.g. by setting a new one -(remember to do a "flush privileges" then). - -* WHAT TO DO AFTER UPGRADES: -============================ -The privilege tables are automatically updated so all there is left is read -the changelogs on dev.mysql.com to see if any changes affect custom apps. - -* WHAT TO DO AFTER INSTALLATION: -================================ -The MySQL manual describes certain steps to do at this stage in a separate -chapter. They are not necessary as the Debian packages does them -automatically. - -The only thing that is left over for the admin is - - setting the passwords - - creating new users and databases - - read the rest of this text - -* DOWNGRADING TO 4.0 or 4.1: -============================ -Unsupported. Period. -But if you do and get problems or make interesting experiences, mail me, it -might help others. -Ok, if you really want, I would recommend to "mysqldump --opt" all tables, -then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps. Be -carefully, though, with the "mysql" table, you might not simply overwrite that -one as the password for the mysql "debian-sys-maint" user is stored in -/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if -it's alive. - -* SOME APPLICATION CAN NO LONGER CONNECT: -========================================= -This application is probably linked against libmysqlclient12 or below and -somebody has created a mysql user with new-style passwords. -The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the -application that inserted the user has to be changed or the application that -tries to connect updated to libmysqlclient14 or -15. - -* NETWORKING: -============= -For security reasons, the Debian package has enabled networking only on the -loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with -"netstat -tlnp" where it is listening. If your connection is aborted -immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read -hosts_access(5). - -* WHERE IS THE DOCUMENTATION?: -============================== -Unfortunately due to licensing restrictions, debian currently not able -to provide the mysql-doc package in any format. For the most up to date -documentation, please go to http://dev.mysql.com/doc. - -* PASSWORDS: -============ -It is strongly recommended to set a password for the mysql root user (which - /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'" - /usr/bin/mysql -u root -e "flush privileges" -If you already had a password set add "-p" before "-u" to the lines above. - - -If you are tired to type the password in every time or want to automate your -scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600 -(-rw------- username username .my.cnf) to ensure that nobody else can read -it. Every other configuration parameter can be stored there, too. You will -find an example below and more information in the MySQL manual in -/usr/share/doc/mariadb-doc or www.mysql.com. - -ATTENTION: It is necessary, that a .my.cnf from root always contains a "user" -line wherever there is a "password" line, else, the Debian maintenance -scripts, that use /etc/mysql/debian.cnf, will use the username -"debian-sys-maint" but the password that is in root's .my.cnf. Also note, -that every change you make in the /root/.my.cnf will affect the mysql cron -script, too. - - # an example of $HOME/.my.cnf - [client] - user = your-mysql-username - password = enter-your-good-new-password-here - -* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE: -========================================= -If you ever run out of rows in a table there is the possibility of building -the package with "-DBIG_ROWS" which, according to a MySQL employee on -packagers@lists.mysql.com should lead to a 64bit row index (I guess > 2^32 -rows) but also to an approx. 5% performance loss. - -* BerkeleyDB Storage Engine -=========================== -Support for BerkeleyDB has been removed in 5.1, and consequently both the -have-bdb and skip-bdb configuration options will cause the server to fail. -Removing the options from /etc/mysql/my.cnf will fix this problem. - -* FURTHER NOTES ON REPLICATION -=============================== -If the MySQL server is acting as a replication slave, you should not -set --tmpdir to point to a directory on a memory-based filesystem or to -a directory that is cleared when the server host restarts. A replication -slave needs some of its temporary files to survive a machine restart so -that it can replicate temporary tables or LOAD DATA INFILE operations. If -files in the temporary file directory are lost when the server restarts, -replication fails. diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.dirs b/debian/dist/Debian/mariadb-galera-server-10.0.dirs deleted file mode 100644 index 8260f7f17ee..00000000000 --- a/debian/dist/Debian/mariadb-galera-server-10.0.dirs +++ /dev/null @@ -1,10 +0,0 @@ -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-galera-server-10.0 -var/run/mysqld -var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.postinst b/debian/dist/Debian/mariadb-galera-server-10.0.postinst deleted file mode 100644 index 5179fd4944a..00000000000 --- a/debian/dist/Debian/mariadb-galera-server-10.0.postinst +++ /dev/null @@ -1,276 +0,0 @@ -#!/bin/bash -e - -. /usr/share/debconf/confmodule - -if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi -${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } - -export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin - -# This command can be used as pipe to syslog. With "-s" it also logs to stderr. -ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i" -# This will make an error in a logged command immediately apparent by aborting -# the install, rather than failing silently and leaving a broken install. -set -o pipefail - -invoke() { - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d mysql $1 - else - /etc/init.d/mysql $1 - fi -} - -MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" - -test_mysql_access() { - mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 -} - -# call with $1 = "online" to connect to the server, otherwise it bootstraps -set_mysql_rootpw() { - # forget we ever saw the password. don't use reset to keep the seen status - db_set mysql-server/root_password "" - - tfile=`mktemp` - if [ ! -f "$tfile" ]; then - return 1 - fi - - # this avoids us having to call "test" or "[" on $rootpw - cat << EOF > $tfile -USE mysql; -SET sql_log_bin=0; -UPDATE user SET password=PASSWORD("$rootpw") WHERE user='root'; -FLUSH PRIVILEGES; -EOF - if grep -q 'PASSWORD("")' $tfile; then - retval=0 - elif [ "$1" = "online" ]; then - mysql --no-defaults -u root -h localhost <$tfile >/dev/null - retval=$? - else - $MYSQL_BOOTSTRAP <$tfile - retval=$? - fi - rm -f $tfile - return $retval -} - -# This is necessary because mysql_install_db removes the pid file in /var/run -# and because changed configuration options should take effect immediately. -# In case the server wasn't running at all it should be ok if the stop -# script fails. I can't tell at this point because of the cleaned /var/run. -set +e; invoke stop; set -e - -case "$1" in - configure) - mysql_datadir=/usr/share/mysql - mysql_statedir=/var/lib/mysql - mysql_rundir=/var/run/mysqld - mysql_logdir=/var/log - mysql_cfgdir=/etc/mysql - mysql_newlogdir=/var/log/mysql - mysql_upgradedir=/var/lib/mysql-upgrade - - # first things first, if the following symlink exists, it is a preserved - # copy the old data dir from a mysql upgrade that would have otherwise - # been replaced by an empty mysql dir. this should restore it. - for dir in DATADIR LOGDIR; do - if [ "$dir" = "DATADIR" ]; then targetdir=$mysql_statedir; else targetdir=$mysql_newlogdir; fi - savelink="$mysql_upgradedir/$dir.link" - if [ -L "$savelink" ]; then - # If the targetdir was a symlink before we upgraded it is supposed - # to be either still be present or not existing anymore now. - if [ -L "$targetdir" ]; then - rm "$savelink" - elif [ ! -d "$targetdir" ]; then - mv "$savelink" "$targetdir" - else - # this should never even happen, but just in case... - mysql_tmp=`mktemp -d -t mysql-symlink-restore-XXXXXX` - echo "this is very strange! see $mysql_tmp/README..." >&2 - mv "$targetdir" "$mysql_tmp" - cat << EOF > "$mysql_tmp/README" - -if 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 -removed your symlink (see #182747 and others). the mysql packages noticed -that this happened, and as a workaround have restored it. however, because -/var/lib/mysql seems to have been re-created in the meantime, and because -we don't want to rm -rf something we don't know as much about, we're going -to leave this unexpected directory here. if your database looks normal, -and this is not a symlink to your database, you should be able to blow -this all away. - -EOF - fi - fi - rmdir $mysql_upgradedir 2>/dev/null || true - done - - # Ensure the existence and right permissions for the database and - # log files. - if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi - if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; 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. - # /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 - # circumstances as it contains scripts that are executed by root. - set +e - chown -R 0:0 $mysql_datadir - chown -R mysql $mysql_statedir - chown -R mysql $mysql_rundir - chown -R mysql:adm $mysql_newlogdir; chmod 2750 $mysql_newlogdir; - for i in log err; do - touch $mysql_logdir/mysql.$i - chown mysql:adm $mysql_logdir/mysql.$i - chmod 0640 $mysql_logdir/mysql.$i - done - set -e - - # This is important to avoid dataloss when there is a removed - # mysql-server version from Woody lying around which used the same - # data directory and then somewhen gets purged by the admin. - db_set mysql-server/postrm_remove_database false || true - - # To avoid downgrades. - touch $mysql_statedir/debian-10.0.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 - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER - set -e - - ## On every reconfiguration the maintenance user is recreated. - # - # - It is easier to regenerate the password every time but as people - # use fancy rsync scripts and file alteration monitors, the existing - # password is used and existing files not touched. - # - The mysqld statement is like that in mysql_install_db because the - # server is not already running. This has some implications: - # - The amount of newlines and semicolons in the query is important! - # - GRANT is not possible with --skip-grant-tables and "INSERT - # (user,host..) VALUES" is not --ansi compliant - # - The echo is just for readability. ash's buildin has no "-e" so use /bin/echo. - # - The Super_priv, Show_db_priv, Create_tmp_table_priv and Lock_tables_priv - # may not be present as old Woody 3.23 databases did not have it and the - # admin might not already have run mysql_upgrade which adds them. - # As the binlog cron scripts to need at least the Super_priv, I do first - # the old query which always succeeds and then the new which may or may not. - - # recreate the credentials file if not present or without mysql_upgrade stanza - dc=$mysql_cfgdir/debian.cnf; - if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then - pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`" - else - pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`; - if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi - cat /dev/null > $dc - echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc - echo "[client]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "[mysql_upgrade]" >>$dc - echo "host = localhost" >>$dc - echo "user = debian-sys-maint" >>$dc - echo "password = $pass" >>$dc - echo "socket = $mysql_rundir/mysqld.sock" >>$dc - echo "basedir = /usr" >>$dc - fi - # If this dir chmod go+w then the admin did it. But this file should not. - chown 0:0 $dc - chmod 0600 $dc - - # update privilege tables - password_column_fix_query=`/bin/echo -e \ - "USE mysql;\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"` - replace_query=`/bin/echo -e \ - "USE mysql;\n" \ - "SET sql_mode='';\n" \ - "REPLACE INTO user SET " \ - " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ - " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \ - " Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \ - " Process_priv='Y', File_priv='Y', Grant_priv='Y', References_priv='Y', " \ - " Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\ - " Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\ - " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\ - " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ - " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ - " ssl_cipher='', x509_issuer='', x509_subject='';"`; - # Engines supported by etch should be installed per default. The query sequence is supposed - # to be aborted if the CREATE TABLE fails due to an already existent table in which case the - # admin might already have chosen to remove one or more plugins. Newlines are necessary. - install_plugins=`/bin/echo -e \ - "USE mysql;\n" \ - "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` - - # Upgrade password column format before the root password gets set. - echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - - db_get mysql-server/root_password && rootpw="$RET" - if ! set_mysql_rootpw; then - password_error="yes" - fi - - set +e - echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - set -e - ;; - - abort-upgrade|abort-remove|abort-configure) - ;; - - *) - echo "postinst called with unknown argument '$1'" 1>&2 - exit 1 - ;; -esac - -# here we check to see if we can connect as root without a password -# this should catch upgrades from previous versions where the root -# password wasn't set. if there is a password, or if the connection -# fails for any other reason, nothing happens. -if [ "$1" = "configure" ]; then - if test_mysql_access; then - db_input medium mysql-server/root_password || true - db_go - db_get mysql-server/root_password && rootpw="$RET" - - if ! set_mysql_rootpw "online"; then - password_error="yes" - fi - fi - - if [ "$password_error" = "yes" ]; then - db_input high mysql-server/error_setting_password || true - db_go - fi - -fi - -db_stop # in case invoke failes - -# If we upgrade from MySQL mysql.service may be masked, which also -# means init.d script is disabled. Unmask mysql service explicitely. -# Check first that the command exists, to avoid emitting any warning messages. -if [ -x "$(command -v deb-systemd-helper)" ]; then - deb-systemd-helper unmask mysql.service > /dev/null -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.postrm b/debian/dist/Debian/mariadb-galera-server-10.0.postrm deleted file mode 100644 index 469b1627aff..00000000000 --- a/debian/dist/Debian/mariadb-galera-server-10.0.postrm +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -e - -# It is possible that Debconf has already been removed, too. -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 -${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 } - -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" - -# 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 -# is running! -stop_server() { - set +e - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d mysql stop - else - /etc/init.d/mysql stop - fi - errno=$? - set -e - - if [ "$?" != 0 ]; then - echo "Trying to stop the MySQL server resulted in exitcode $?." 1>&2 - echo "Stop it yourself and try again!" 1>&2 - exit 1 - fi -} - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ -n "`$MYADMIN ping 2>/dev/null`" ]; then - stop_server - sleep 2 - fi - ;; - *) - echo "postrm called with unknown argument '$1'" 1>&2 - exit 1 - ;; -esac - -# -# - Do NOT purge logs or data if another mysql-sever* package is installed (#307473) -# - Remove the mysql user only after all his owned files are purged. -# -if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; then - # we remove the mysql user only after all his owned files are purged - rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz} - rm -rf /var/log/mysql - - db_input high mysql-server-5.1/postrm_remove_databases || true - db_go || true - db_get mysql-server-5.1/postrm_remove_databases || true - if [ "$RET" = "true" ]; then - # never remove the debian.cnf when the databases are still existing - # else we ran into big trouble on the next install! - rm -f /etc/mysql/debian.cnf - rm -rf /var/lib/mysql - rm -rf /var/run/mysqld - userdel mysql || true - fi - - # (normally) Automatically added by dh_installinit - if [ "$1" = "purge" ] ; then - update-rc.d mysql remove >/dev/null || exit 0 - fi - # (normally) End automatically added section -fi - -# (normally) Automatically added by dh_installdebconf -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi -# (normally) End automatically added section - -# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed - -exit 0 diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules deleted file mode 100755 index a0923c83b54..00000000000 --- a/debian/dist/Debian/rules +++ /dev/null @@ -1,283 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 - -PACKAGE=mariadb-10.0 - -include /usr/share/dpatch/dpatch.make - -TMP=$(CURDIR)/debian/tmp/ - -ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) -ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) - -DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) -DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-) -DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') -DEB_UPSTREAM_VERSION_MAJOR_MINOR := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r -n 's/^([0-9]+\.[0-9]+).*/\1/p') - -DISTRIBUTION = $(shell lsb_release -i -s) -RELEASE = $(shell lsb_release -r -s | sed 's/\..*//' ) - -MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi) -ifeq (${MAKE_J}, -j0) - MAKE_J = -j1 -endif - -MAKE_TEST_TARGET=test-force -ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),) -# make test-bt is the testsuite run by the MySQL build team -# before a release, but it is long - MAKE_TEST_TARGET=test-bt -endif - -USE_ASSEMBLER=--enable-assembler - -ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390)) - TESTSUITE_FAIL_CMD=exit 1 -else - TESTSUITE_FAIL_CMD=true -endif - -BUILDDIR = builddir -builddir = $(BUILDDIR) - -# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf -# so it is disabled by default although, according to MySQL, it brings >10% -# performance gain if enabled. See #299382. -ifeq ($(STATIC_MYSQLD), 1) - USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static -endif - -configure: patch configure-stamp -configure-stamp: - @echo "RULES.$@" - dh_testdir - -ifneq ($(ARCH_OS),hurd) - if [ ! -d /proc/self ]; then echo "/proc IS NEEDED" 1>&2; exit 1; fi -endif - - ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ - sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ - CC=$${MYSQL_BUILD_CC:-gcc} \ - CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized $$(case `lsb_release -sc` in (lenny) echo -DWORKAROUND_GCC_4_3_2_BUG ;; esac)"} \ - CXX=$${MYSQL_BUILD_CXX:-g++} \ - CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ - cmake .. \ - -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ - -DBUILD_CONFIG=mysql_release \ - -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ - -DSYSTEM_TYPE="debian-linux-gnu" \ - -DDEB=debian' - - touch $@ - -build: build-stamp - -build-stamp: configure - @echo "RULES.$@" - dh_testdir - - cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS) - -ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),) - if [ ! -f testsuite-stamp ] ; then \ - cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \ - fi -endif - - touch testsuite-stamp - - touch build-stamp - -clean: clean-patched unpatch - rm -rf debian/patched -clean-patched: - @echo "RULES.clean-patched" - dh_testdir - dh_testroot - rm -f configure-stamp* - rm -f build-stamp* - rm -f testsuite-stamp - # - [ ! -f Makefile ] || $(MAKE) clean - [ ! -d mysql-test/var ] || rm -rf mysql-test/var - # - rm -rf $(BUILDDIR) - - debconf-updatepo - dh_clean -v - - -install: build - @echo "RULES.$@" - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # some self written manpages which hopefully - # gets overwritten sooner or later with upstreams - mkdir -p $(TMP)/usr/share/man/man1/ - mkdir -p $(TMP)/usr/share/man/man8/ - cp debian/additions/*.1 $(TMP)/usr/share/man/man1/ - mkdir -p $(TMP)/etc/mysql/conf.d/ - cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/ - - # make install (trailing slash needed for innobase) - cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/ - # - # After installing, remove rpath to make lintian happy. - set +e; \ - find ./debian/tmp/ -type f -print0 \ - | xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \ - | fgrep RPATH= \ - | cut -d: -f 1 \ - | xargs --no-run-if-empty chrpath -d; \ - set -e - - # libmysqlclient-dev: forgotten header file since 3.23.25? - cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ - cp include/my_dir.h $(TMP)/usr/include/mysql/ - - # mysql-common: We provide our own version of this package for - # completeness, but we can use an existing version; mariadb-specic - # stuff is in mariadb-common - install -d $(TMP)/etc/mysql - install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf - - # mariadb-common: MariaDB-specific config stuff. - install -d $(TMP)/etc/mysql/conf.d - install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf - - # mariadb-client - install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/ - install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/ - install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/ - - # mariadb-galera-server - install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe - mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples - # We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf) - # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples/ - rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ - $(TMP)/usr/share/mysql/config-*.cnf \ - $(TMP)/usr/share/mysql/mi_test_all* \ - $(TMP)/usr/share/mysql/mysql-log-rotate \ - $(TMP)/usr/share/mysql/mysql.server \ - $(TMP)/usr/share/mysql/binary-configure - nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz - install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ - install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ - install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ - - install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN - - # mariadb-test - mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql - - # lintian overrides - mkdir -p $(TMP)/usr/share/lintian/overrides/ - cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0 - - # For 5.0 -> 10.0 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-galera-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-galera-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ - cp debian/additions/debian-start $$d/_etc_mysql_debian-start; - - autorm=debian/autorm-file; \ - rm -f $$autorm; \ - ignore=''; \ - for p in $$MARIADB_OPTIONAL_DEBS; do \ - p=mariadb-$$p; \ - dh_movefiles --package=$$p || echo "../$$p*.deb" >> $$autorm; \ - ignore="$$ignore --no-package=$$p"; \ - done; \ - sh -c "dh_movefiles $$ignore" - -# Build architecture-independent files here. -binary-indep: build install - @echo "RULES.binary-indep" - dh_testdir -i - dh_testroot -i - dh_installdebconf -i - dh_installdocs -i - dh_installexamples -i - dh_installmenu -i - dh_installlogrotate -i - dh_installinit -i - dh_installcron -i - dh_installman -i - dh_installinfo -i - dh_installlogcheck -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_perl -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - @echo "RULES.binary-arch" - dh_testdir - dh_testroot - - dh_installdebconf -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installlogrotate -a --name mysql-server - # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets - # started which might depend on a running database server. - dh_installinit -a --name=mysql -- defaults 19 21 - dh_installcron -a --name mysql-server - dh_installman -a - dh_installinfo -a - dh_installlogcheck -a - dh_installchangelogs -a - dh_strip -a - dh_link -a # .so muss nach .so.1.2.3 installier werden! - dh_compress -a --exclude=INFO_BIN - dh_fixperms -a - dh_makeshlibs -a - dh_makeshlibs -plibmariadbclient18 -V'libmariadbclient18 (>= 5.5.1-1)' - dh_installdeb -a - dh_perl -a - dh_shlibdeps -a -l debian/libmariadbclient18/usr/lib -L libmariadbclient18 - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch - -get-orig-source: - @wget -nv -T10 -t3 \ - -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \ - http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian - @mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - -.PHONY: clean clean-patched configure build binary binary-indep binary-arch install patch unpatch - -# vim: ts=8 diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian b/debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian deleted file mode 100644 index 741243f1ec3..00000000000 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.README.Debian +++ /dev/null @@ -1,109 +0,0 @@ -* MYSQL WON'T START OR STOP?: -============================= -You may never ever delete the special mysql user "debian-sys-maint". This -user together with the credentials in /etc/mysql/debian.cnf are used by the -init scripts to stop the server as they would require knowledge of the mysql -root users password else. -So in most of the times you can fix the situation by making sure that the -debian.cnf file contains the right password, e.g. by setting a new one -(remember to do a "flush privileges" then). - -* WHAT TO DO AFTER UPGRADES: -============================ -The privilege tables are automatically updated so all there is left is read -the changelogs on dev.mysql.com to see if any changes affect custom apps. - -* WHAT TO DO AFTER INSTALLATION: -================================ -The MySQL manual describes certain steps to do at this stage in a separate -chapter. They are not necessary as the Debian packages does them -automatically. - -The only thing that is left over for the admin is - - setting the passwords - - creating new users and databases - - read the rest of this text - -* DOWNGRADING TO 4.0 or 4.1: -============================ -Unsupported. Period. -But if you do and get problems or make interesting experiences, mail me, it -might help others. -Ok, if you really want, I would recommend to "mysqldump --opt" all tables, -then purge 4.1, delete /var/lib/mysql, install 4.0 and insert the dumps. Be -carefully, though, with the "mysql" table, you might not simply overwrite that -one as the password for the mysql "debian-sys-maint" user is stored in -/etc/mysql/debian.cnf and needed by /etc/init.d/ to start mysql and check if -it's alive. - -* SOME APPLICATION CAN NO LONGER CONNECT: -========================================= -This application is probably linked against libmysqlclient12 or below and -somebody has created a mysql user with new-style passwords. -The old_passwords=1 option in /etc/mysql/my.cnf might help. If not the -application that inserted the user has to be changed or the application that -tries to connect updated to libmysqlclient14 or -15. - -* NETWORKING: -============= -For security reasons, the Debian package has enabled networking only on the -loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with -"netstat -tlnp" where it is listening. If your connection is aborted -immediately see if "mysqld: all" or similar is in /etc/hosts.allow and read -hosts_access(5). - -* WHERE IS THE DOCUMENTATION?: -============================== -Unfortunately due to licensing restrictions, debian currently not able -to provide the mysql-doc package in any format. For the most up to date -documentation, please go to http://dev.mysql.com/doc. - -* PASSWORDS: -============ -It is strongly recommended to set a password for the mysql root user (which - /usr/bin/mysql -u root -D mysql -e "update user set password=password('new-password') where user='root'" - /usr/bin/mysql -u root -e "flush privileges" -If you already had a password set add "-p" before "-u" to the lines above. - - -If you are tired to type the password in every time or want to automate your -scripts you can store it in the file $HOME/.my.cnf. It should be chmod 0600 -(-rw------- username username .my.cnf) to ensure that nobody else can read -it. Every other configuration parameter can be stored there, too. You will -find an example below and more information in the MySQL manual in -/usr/share/doc/mysql-doc or www.mysql.com. - -ATTENTION: It is necessary, that a .my.cnf from root always contains a "user" -line wherever there is a "password" line, else, the Debian maintenance -scripts, that use /etc/mysql/debian.cnf, will use the username -"debian-sys-maint" but the password that is in root's .my.cnf. Also note, -that every change you make in the /root/.my.cnf will affect the mysql cron -script, too. - - # an example of $HOME/.my.cnf - [client] - user = your-mysql-username - password = enter-your-good-new-password-here - -* BIG_ROWS FOR EVEN MORE ROWS IN A TABLE: -========================================= -If you ever run out of rows in a table there is the possibility of building -the package with "-DBIG_ROWS" which, according to a MySQL employee on -packagers@lists.mysql.com should lead to a 64bit row index (I guess > 2^32 -rows) but also to an approx. 5% performance loss. - -* BerkeleyDB Storage Engine -=========================== -Support for BerkeleyDB has been removed in 5.1, and consequently both the -have-bdb and skip-bdb configuration options will cause the server to fail. -Removing the options from /etc/mysql/my.cnf will fix this problem. - -* FURTHER NOTES ON REPLICATION -=============================== -If the MySQL server is acting as a replication slave, you should not -set --tmpdir to point to a directory on a memory-based filesystem or to -a directory that is cleared when the server host restarts. A replication -slave needs some of its temporary files to survive a machine restart so -that it can replicate temporary tables or LOAD DATA INFILE operations. If -files in the temporary file directory are lost when the server restarts, -replication fails. diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in b/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in deleted file mode 100644 index 368400c68b8..00000000000 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.files.in +++ /dev/null @@ -1,118 +0,0 @@ -usr/sbin/mysqld -usr/lib/mysql/plugin/auth_pam.so -usr/lib/mysql/plugin/auth_socket.so -usr/lib/mysql/plugin/ha_mroonga.so -usr/lib/mysql/plugin/ha_sequence.so -usr/lib/mysql/plugin/ha_sphinx.so -usr/lib/mysql/plugin/ha_innodb.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/sql_errlog.so -usr/lib/mysql/plugin/server_audit.so -usr/lib/libhsclient.so.* -etc/apparmor.d/usr.sbin.mysqld -usr/share/apport/package-hooks/source_mariadb-10.0.py -etc/mysql/debian-start -etc/mysql/conf.d/mysqld_safe_syslog.cnf -usr/bin/msql2mysql -usr/bin/my_print_defaults -usr/bin/myisamchk -usr/bin/myisam_ftdump -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/aria_pack -usr/bin/aria_read_log -usr/bin/aria_ftdump -usr/bin/aria_chk -usr/bin/aria_dump_log -usr/bin/mysql_convert_table_format -usr/bin/mysql_install_db -usr/bin/mysql_plugin -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_zap -usr/bin/mysqlbinlog -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqlhotcopy -usr/bin/perror -usr/bin/replace -usr/bin/resolve_stack_dump -usr/bin/resolveip -usr/bin/wsrep_sst_common -usr/bin/wsrep_sst_mysqldump -usr/bin/wsrep_sst_rsync -usr/bin/wsrep_sst_xtrabackup -usr/bin/wsrep_sst_xtrabackup-v2 -usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-galera-server-10.0/INFO_SRC -usr/share/doc/mariadb-galera-server-10.0/INFO_BIN -usr/share/doc/mariadb-galera-server-10.0/README-wsrep -usr/share/lintian/overrides/mariadb-galera-server-10.0 -usr/share/man/man1/msql2mysql.1 -usr/share/man/man1/myisamchk.1 -usr/share/man/man1/myisam_ftdump.1 -usr/share/man/man1/myisamlog.1 -usr/share/man/man1/myisampack.1 -usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqlhotcopy.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man1/mysql_zap.1 -usr/share/man/man1/perror.1 -usr/share/man/man1/replace.1 -usr/share/man/man1/resolveip.1 -usr/share/man/man1/resolve_stack_dump.1 -usr/share/man/man1/innochecksum.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man8/mysqld.8 -usr/share/mysql/charsets -usr/share/mysql/czech -usr/share/mysql/danish -usr/share/mysql/dutch -usr/share/mysql/english -usr/share/mysql/estonian -usr/share/mysql/french -usr/share/mysql/german -usr/share/mysql/greek -usr/share/mysql/hungarian -usr/share/mysql/italian -usr/share/mysql/japanese -usr/share/mysql/korean -usr/share/mysql/norwegian -usr/share/mysql/norwegian-ny -usr/share/mysql/polish -usr/share/mysql/portuguese -usr/share/mysql/romanian -usr/share/mysql/russian -usr/share/mysql/serbian -usr/share/mysql/slovak -usr/share/mysql/spanish -usr/share/mysql/swedish -usr/share/mysql/ukrainian -usr/share/mysql/debian-start.inc.sh -usr/share/mysql/echo_stderr -usr/share/mysql/errmsg-utf8.txt -usr/share/mysql/fill_help_tables.sql -usr/share/mysql/mysql_system_tables_data.sql -usr/share/mysql/mysql_system_tables.sql -usr/share/mysql/mysql_performance_tables.sql -usr/share/mysql/mysql_test_data_timezone.sql -@CASSANDRA_DEB_FILES@ -@SPIDER_DEB_FILES@ -@TOKUDB_DEB_FILES@ -usr/share/mysql/wsrep.cnf -usr/share/mysql/wsrep_notify diff --git a/debian/libmariadbclient-dev.README.Maintainer b/debian/libmariadbclient-dev.README.Maintainer new file mode 100644 index 00000000000..f24cdcd519d --- /dev/null +++ b/debian/libmariadbclient-dev.README.Maintainer @@ -0,0 +1,4 @@ +The examples directory includes files that might be needed by some +developers: +- header files not installed by default +- the example file udf_example.c diff --git a/debian/libmariadbclient-dev.dirs b/debian/libmariadbclient-dev.dirs new file mode 100644 index 00000000000..f6ad2870431 --- /dev/null +++ b/debian/libmariadbclient-dev.dirs @@ -0,0 +1,2 @@ +usr/include/ +usr/lib/ diff --git a/debian/libmariadbclient-dev.examples b/debian/libmariadbclient-dev.examples new file mode 100644 index 00000000000..f1649c311c4 --- /dev/null +++ b/debian/libmariadbclient-dev.examples @@ -0,0 +1 @@ +sql/udf_example.c diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files new file mode 100644 index 00000000000..a7595dceffd --- /dev/null +++ b/debian/libmariadbclient-dev.files @@ -0,0 +1,8 @@ +usr/bin/mysql_config +usr/include/mysql +usr/lib/libmysqlclient.a +usr/lib/libmysqlclient_r.a +usr/lib/libmysqlservices.a +usr/share/aclocal/mysql.m4 +usr/share/pkgconfig/mariadb.pc +usr/share/man/man1/mysql_config.1 diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadbclient-dev.links new file mode 100644 index 00000000000..0076791dcfa --- /dev/null +++ b/debian/libmariadbclient-dev.links @@ -0,0 +1,2 @@ +usr/lib/libmysqlclient.so.18 usr/lib/libmysqlclient.so +usr/lib/libmysqlclient_r.so.18 usr/lib/libmysqlclient_r.so diff --git a/debian/libmariadbclient18.dirs b/debian/libmariadbclient18.dirs new file mode 100644 index 00000000000..2964de6141b --- /dev/null +++ b/debian/libmariadbclient18.dirs @@ -0,0 +1 @@ +usr/lib/ diff --git a/debian/libmariadbclient18.files b/debian/libmariadbclient18.files new file mode 100644 index 00000000000..75020ecbd16 --- /dev/null +++ b/debian/libmariadbclient18.files @@ -0,0 +1,3 @@ +usr/lib/libmysqlclient*.so.* +usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/dialog.so diff --git a/debian/libmariadbclient18.postinst b/debian/libmariadbclient18.postinst new file mode 100644 index 00000000000..29d3b86f978 --- /dev/null +++ b/debian/libmariadbclient18.postinst @@ -0,0 +1,12 @@ +#!/bin/bash -e + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + +# vim: ts=4 + + diff --git a/debian/libmariadbd-dev.files b/debian/libmariadbd-dev.files new file mode 100644 index 00000000000..26cb8d0a606 --- /dev/null +++ b/debian/libmariadbd-dev.files @@ -0,0 +1,2 @@ +usr/lib/mysql/*.a +usr/lib/mysql/*.la diff --git a/debian/mariadb-client-10.1.README.Debian b/debian/mariadb-client-10.1.README.Debian new file mode 100644 index 00000000000..64f0f509951 --- /dev/null +++ b/debian/mariadb-client-10.1.README.Debian @@ -0,0 +1,4 @@ +FAQ: + +Q: My <tab> completion is gone, why? +A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf! diff --git a/debian/mariadb-client-10.1.dirs b/debian/mariadb-client-10.1.dirs new file mode 100644 index 00000000000..ceda5922c5d --- /dev/null +++ b/debian/mariadb-client-10.1.dirs @@ -0,0 +1,3 @@ +usr/bin/ +usr/share/man/man1/ +usr/share/perl5/ diff --git a/debian/mariadb-client-10.1.docs b/debian/mariadb-client-10.1.docs new file mode 100644 index 00000000000..21446855f51 --- /dev/null +++ b/debian/mariadb-client-10.1.docs @@ -0,0 +1,2 @@ +debian/additions/innotop/changelog.innotop +README diff --git a/debian/mariadb-client-10.1.files b/debian/mariadb-client-10.1.files new file mode 100644 index 00000000000..e6033952c26 --- /dev/null +++ b/debian/mariadb-client-10.1.files @@ -0,0 +1,27 @@ +usr/bin/innochecksum +usr/bin/innotop +usr/bin/mysqlaccess +usr/bin/mysqladmin +usr/bin/mysqlbug +usr/bin/mysqldump +usr/bin/mysqldumpslow +usr/bin/mysql_find_rows +usr/bin/mysql_fix_extensions +usr/bin/mysqlimport +usr/bin/mysqlreport +usr/bin/mysqlshow +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/mysqlbug.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 diff --git a/debian/mariadb-client-10.1.links b/debian/mariadb-client-10.1.links new file mode 100644 index 00000000000..0b86e87f2e9 --- /dev/null +++ b/debian/mariadb-client-10.1.links @@ -0,0 +1,6 @@ +usr/bin/mysqlcheck usr/bin/mysqlrepair +usr/bin/mysqlcheck usr/bin/mysqlanalyze +usr/bin/mysqlcheck usr/bin/mysqloptimize +usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlrepair.1.gz +usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqlanalyze.1.gz +usr/share/man/man1/mysqlcheck.1.gz usr/share/man/man1/mysqloptimize.1.gz diff --git a/debian/mariadb-client-10.1.menu b/debian/mariadb-client-10.1.menu new file mode 100644 index 00000000000..1378555c423 --- /dev/null +++ b/debian/mariadb-client-10.1.menu @@ -0,0 +1,3 @@ +# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/ +?package(innotop):needs="text" section="Applications/Data Management"\ + title="innotop" command="/usr/bin/innotop" diff --git a/debian/mariadb-client-core-10.1.files b/debian/mariadb-client-core-10.1.files new file mode 100644 index 00000000000..a2781309439 --- /dev/null +++ b/debian/mariadb-client-core-10.1.files @@ -0,0 +1,4 @@ +usr/bin/mysql +usr/bin/mysqlcheck +usr/share/man/man1/mysql.1 +usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-common.files b/debian/mariadb-common.files new file mode 100644 index 00000000000..f37e46c45fe --- /dev/null +++ b/debian/mariadb-common.files @@ -0,0 +1 @@ +etc/mysql/conf.d/mariadb.cnf diff --git a/debian/mariadb-common.postrm b/debian/mariadb-common.postrm new file mode 100644 index 00000000000..027592f816e --- /dev/null +++ b/debian/mariadb-common.postrm @@ -0,0 +1,8 @@ +#!/bin/bash -e + +if [ "$1" = "purge" ]; then + rmdir /etc/mysql/conf.d 2>/dev/null || true + rmdir /etc/mysql 2>/dev/null || true +fi + +#DEBHELPER# diff --git a/debian/mariadb-connect-engine-10.1.files b/debian/mariadb-connect-engine-10.1.files new file mode 100644 index 00000000000..0b042607c36 --- /dev/null +++ b/debian/mariadb-connect-engine-10.1.files @@ -0,0 +1,2 @@ +usr/lib/mysql/plugin/ha_connect.so +etc/mysql/conf.d/connect.cnf diff --git a/debian/mariadb-cracklib-password-check-10.1.files b/debian/mariadb-cracklib-password-check-10.1.files new file mode 100644 index 00000000000..3fe06639703 --- /dev/null +++ b/debian/mariadb-cracklib-password-check-10.1.files @@ -0,0 +1 @@ +usr/lib/mysql/plugin/cracklib_password_check.so diff --git a/debian/mariadb-galera-server-10.0.NEWS b/debian/mariadb-galera-server-10.0.NEWS deleted file mode 100644 index a3042dc2918..00000000000 --- a/debian/mariadb-galera-server-10.0.NEWS +++ /dev/null @@ -1,34 +0,0 @@ -mysql-dfsg-5.1 (5.1.38-1) unstable; urgency=low - - * Please read http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html - * Make sure to do a REPAIR TABLE on all tables that use UTF-8 and have a - FULLTEXT index. - - -- Christian Hammers <ch@debian.org> Sat, 4 Jul 2009 02:31:21 +0200 - -mysql-dfsg-5.0 (5.1.14beta-2) unstable; urgency=low - - * The BerkeleyDB Storage Engine is no longer supported. If the options - have-bdb or skip-bdb are found, MySQL will not start. If you have BDB - tables, you should change them to use another storage engine before - upgrading to 5.1. - - -- Monty Taylor <mordred@inaugust.com> Thu, 18 Jan 2007 12:28:21 -0800 - -mysql-dfsg-5.0 (5.0.45-2) unstable; urgency=low - - * Binary logging is now disabled by default. If you really need it (e.g. on - a replication master), remove the comment from the log_bin line in my.cnf. - - -- Norbert Tretkowski <nobse@debian.org> Sat, 10 Nov 2007 16:26:35 +0100 - -mysql-dfsg-5.0 (5.0.18-9) unstable; urgency=low - - * Rotation of the binary logs is now configured in /etc/mysql/my.cnf with - "expire-logs-days" which defaults to 20 days. The old file - /etc/mysql/debian-log-rotate.conf should be removed together with - /etc/cron.daily/mysql-server after this value has been adjusted. Note that - the old variable defined the number of files whereas the new one defines - a time span in days. - - -- Christian Hammers <ch@debian.org> Tue, 24 Jan 2006 22:18:21 +0100 diff --git a/debian/mariadb-galera-server-10.0.lintian-overrides b/debian/mariadb-galera-server-10.0.lintian-overrides deleted file mode 100644 index 0b2eb6a6496..00000000000 --- a/debian/mariadb-galera-server-10.0.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -mariadb-galera-server-10.0: command-with-path-in-maintainer-script postinst -mariadb-galera-server-10.0: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' -mariadb-galera-server-10.0: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' -mariadb-galera-server-10.0: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql -mariadb-galera-server-10.0: statically-linked-binary ./usr/sbin/mysqld diff --git a/debian/mariadb-gssapi-client-10.1.files b/debian/mariadb-gssapi-client-10.1.files new file mode 100644 index 00000000000..5a089e9352e --- /dev/null +++ b/debian/mariadb-gssapi-client-10.1.files @@ -0,0 +1 @@ +usr/lib/mysql/plugin/auth_gssapi_client.so diff --git a/debian/mariadb-gssapi-server-10.1.files b/debian/mariadb-gssapi-server-10.1.files new file mode 100644 index 00000000000..d5e7b362a74 --- /dev/null +++ b/debian/mariadb-gssapi-server-10.1.files @@ -0,0 +1 @@ +usr/lib/mysql/plugin/auth_gssapi.so diff --git a/debian/mariadb-oqgraph-engine-10.1.files b/debian/mariadb-oqgraph-engine-10.1.files new file mode 100644 index 00000000000..f67b0cd9d13 --- /dev/null +++ b/debian/mariadb-oqgraph-engine-10.1.files @@ -0,0 +1 @@ +usr/lib/mysql/plugin/ha_oqgraph.so diff --git a/debian/mariadb-server-10.1.README.Debian b/debian/mariadb-server-10.1.README.Debian new file mode 100644 index 00000000000..be2e33d705d --- /dev/null +++ b/debian/mariadb-server-10.1.README.Debian @@ -0,0 +1,106 @@ +* MYSQL WON'T START OR STOP?: +============================= +You may never ever delete the mysql user "root". Although it has no password +is set, the unix_auth plugin ensure that it can only be run locally as the root +user. The credentials in /etc/mysql/debian.cnf specify the user are used by the +init scripts to stop the server and perform logrotation. So in most of the +time you can fix the situation by making sure that the /etc/mysql/debian.cnf +file specifies the root user and no password. + +This used to be the debian-sys-maint user which is no longer used. + +* WHAT TO DO AFTER UPGRADES: +============================ +The privilege tables are automatically updated so all there is left is read +the release notes on https://mariadb.com/kb/en/release-notes/ to see if any +changes affect custom apps. + +* WHAT TO DO AFTER INSTALLATION: +================================ +The MySQL manual describes certain steps to do at this stage in a separate +chapter. They are not necessary as the Debian packages does them +automatically. + +The only thing that is left over for the admin is + - setting the passwords + - creating new users and databases + - read the rest of this text + +* NETWORKING: +============= +For security reasons, the Debian package has enabled networking only on the +loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with +"netstat -tlnp" where it is listening. If your connection is aborted +immediately check your firewall rules or network routes. + +* WHERE IS THE DOCUMENTATION?: +============================== +https://mariadb.com/kb + +* PASSWORDS: +============ +It is strongly recommended you create an admin users for your database +adminstration needs. + +If your your local unix account is the one you want to have local super user +access on your database with you can create the following account that will +only work for the local unix user connecting to the database locally. + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO '$USER'@'localhost' IDENTIFIED VIA unix_socket WITH GRANT OPTION" + +To create a local machine account username=USERNAME with a password: + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'localhost' IDENTIFIED BY 'password' WITH GRANT OPTION" + +To create a USERNAME user with password 'password' admin user that can access +the DB server over the network: + + sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION" + +Scripts should run as a user have have the required grants and be identified via unix_socket. + +If you are too tired to type the password in every time and unix_socket auth +doesn't suit your needs, you can store it in the file $HOME/.my.cnf. It should +be chmod 0600 (-rw------- username username .my.cnf) to ensure that nobody else +can read it. Every other configuration parameter can be stored there, too. + +For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or +https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/. + +ATTENTION: It is necessary, that a ~/.my.cnf from root always contains a "user" +line wherever there is a "password" line, else, the Debian maintenance +scripts, that use /etc/mysql/debian.cnf, will use the username +"root" but the password that is in root's .my.cnf. Also note, +that every change you make in the /root/.my.cnf will affect the mysql cron +script, too. + + # an example of $HOME/.my.cnf + [client] + user = your-mysql-username + password = enter-your-good-new-password-here + +* FURTHER NOTES ON REPLICATION +=============================== +If the MySQL server is acting as a replication slave, you should not +set --tmpdir to point to a directory on a memory-based filesystem or to +a directory that is cleared when the server host restarts. A replication +slave needs some of its temporary files to survive a machine restart so +that it can replicate temporary tables or LOAD DATA INFILE operations. If +files in the temporary file directory are lost when the server restarts, +replication fails. + +* DOWNGRADING +============================ +Unsupported. Period. + +You might get lucky downgrading a few minor versions without issued. Take a +backup first. If you break it you get to keep both pieces. Do a restore from +backup or upgrade to the previous version. + +If doing a major version downgrade, take a mysqldump/mydumpber consistent +backup using the current version and reload after downgrading and purging +existing databases. + +* BACKUPS +============================ +Backups save jobs. Don't get caught without one. diff --git a/debian/mariadb-galera-server-10.0.config b/debian/mariadb-server-10.1.config index 162017caf71..162017caf71 100644 --- a/debian/mariadb-galera-server-10.0.config +++ b/debian/mariadb-server-10.1.config diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs b/debian/mariadb-server-10.1.dirs index 8260f7f17ee..64b49db4af9 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.dirs +++ b/debian/mariadb-server-10.1.dirs @@ -5,6 +5,6 @@ usr/bin usr/sbin usr/share/man/man8 usr/share/mysql -usr/share/doc/mariadb-galera-server-10.0 +usr/share/doc/mariadb-server-10.1 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-galera-server-10.0.files.in b/debian/mariadb-server-10.1.files.in index bf1b04b5787..3b143c5c9cf 100644 --- a/debian/dist/Debian/mariadb-galera-server-10.0.files.in +++ b/debian/mariadb-server-10.1.files.in @@ -1,10 +1,13 @@ -usr/sbin/mysqld 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_innodb.so usr/lib/mysql/plugin/ha_mroonga.so -usr/lib/mysql/plugin/ha_sequence.so usr/lib/mysql/plugin/ha_sphinx.so -usr/lib/mysql/plugin/ha_innodb.so usr/lib/mysql/plugin/handlersocket.so usr/lib/mysql/plugin/locales.so usr/lib/mysql/plugin/metadata_lock_info.so @@ -12,9 +15,13 @@ 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/sql_errlog.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/libhsclient.so.* +etc/apparmor.d/usr.sbin.mysqld +usr/share/apport/package-hooks/source_mariadb-10.1.py etc/mysql/debian-start etc/mysql/conf.d/mysqld_safe_syslog.cnf usr/bin/msql2mysql @@ -49,11 +56,9 @@ usr/bin/wsrep_sst_mysqldump usr/bin/wsrep_sst_rsync usr/bin/wsrep_sst_xtrabackup usr/bin/wsrep_sst_xtrabackup-v2 -usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-galera-server-10.0/INFO_SRC -usr/share/doc/mariadb-galera-server-10.0/INFO_BIN -usr/share/doc/mariadb-galera-server-10.0/README-wsrep -usr/share/lintian/overrides/mariadb-galera-server-10.0 +usr/share/doc/mariadb-server-10.1/mysqld.sym.gz +usr/share/doc/mariadb-server-10.1/INFO_SRC +usr/share/doc/mariadb-server-10.1/INFO_BIN usr/share/man/man1/msql2mysql.1 usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisam_ftdump.1 @@ -76,41 +81,19 @@ 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/man/man8/mysqld.8 -usr/share/mysql/charsets -usr/share/mysql/czech -usr/share/mysql/danish -usr/share/mysql/dutch -usr/share/mysql/english -usr/share/mysql/estonian -usr/share/mysql/french -usr/share/mysql/german -usr/share/mysql/greek -usr/share/mysql/hungarian -usr/share/mysql/italian -usr/share/mysql/japanese -usr/share/mysql/korean -usr/share/mysql/norwegian -usr/share/mysql/norwegian-ny -usr/share/mysql/polish -usr/share/mysql/portuguese -usr/share/mysql/romanian -usr/share/mysql/russian -usr/share/mysql/serbian -usr/share/mysql/slovak -usr/share/mysql/spanish -usr/share/mysql/swedish -usr/share/mysql/ukrainian usr/share/mysql/debian-start.inc.sh usr/share/mysql/echo_stderr usr/share/mysql/errmsg-utf8.txt usr/share/mysql/fill_help_tables.sql +usr/share/mysql/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_test_data_timezone.sql +usr/share/mysql/wsrep_notify @CASSANDRA_DEB_FILES@ @SPIDER_DEB_FILES@ @TOKUDB_DEB_FILES@ -usr/share/mysql/wsrep.cnf -usr/share/mysql/wsrep_notify +@SYSTEMD_DEB_FILES@ diff --git a/debian/mariadb-galera-server-10.0.logcheck.ignore.paranoid b/debian/mariadb-server-10.1.logcheck.ignore.paranoid index 00cc5c3e29d..00cc5c3e29d 100644 --- a/debian/mariadb-galera-server-10.0.logcheck.ignore.paranoid +++ b/debian/mariadb-server-10.1.logcheck.ignore.paranoid diff --git a/debian/mariadb-galera-server-10.0.logcheck.ignore.server b/debian/mariadb-server-10.1.logcheck.ignore.server index 37f25cb01ea..37f25cb01ea 100644 --- a/debian/mariadb-galera-server-10.0.logcheck.ignore.server +++ b/debian/mariadb-server-10.1.logcheck.ignore.server diff --git a/debian/mariadb-galera-server-10.0.logcheck.ignore.workstation b/debian/mariadb-server-10.1.logcheck.ignore.workstation index 37f25cb01ea..37f25cb01ea 100644 --- a/debian/mariadb-galera-server-10.0.logcheck.ignore.workstation +++ b/debian/mariadb-server-10.1.logcheck.ignore.workstation diff --git a/debian/mariadb-galera-server-10.0.mysql-server.logrotate b/debian/mariadb-server-10.1.mysql-server.logrotate index a19e9ec46a2..a19e9ec46a2 100644 --- a/debian/mariadb-galera-server-10.0.mysql-server.logrotate +++ b/debian/mariadb-server-10.1.mysql-server.logrotate diff --git a/debian/mariadb-galera-server-10.0.mysql.init b/debian/mariadb-server-10.1.mysql.init index a59013f8047..91d07e8de3e 100644 --- a/debian/mariadb-galera-server-10.0.mysql.init +++ b/debian/mariadb-server-10.1.mysql.init @@ -17,9 +17,6 @@ set -e set -u ${DEBIAN_SCRIPT_DEBUG:+ set -v -x} -# Prevent Debian's init scripts from calling systemctl -_SYSTEMCTL_SKIP_REDIRECT=true - test -x /usr/sbin/mysqld || exit 0 . /lib/lsb/init-functions @@ -40,6 +37,9 @@ umask 077 # so break my scripts. export HOME=/etc/mysql/ +# Source default config file. +[ -r /etc/default/mariadb ] && . /etc/default/mariadb + ## Fetch a particular option from mysql's invocation. # # Usage: void mysqld_get_param option @@ -111,8 +111,8 @@ case "${1:-''}" in # Start MariaDB! /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & - # 6s was reported in #352070 to be too few when using ndbcluster - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do + # 6s was reported in #352070 to be too little + for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-60}"); do sleep 1 if mysqld_status check_alive nowarn ; then break; fi log_progress_msg "." @@ -155,7 +155,7 @@ case "${1:-''}" in if ! mysqld_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.0/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.1/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.postinst b/debian/mariadb-server-10.1.postinst index e90ef045e2c..ccf7d5c88ca 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.postinst +++ b/debian/mariadb-server-10.1.postinst @@ -23,11 +23,6 @@ invoke() { MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --disable-log-bin --skip-grant-tables --default-storage-engine=myisam" -test_mysql_access() { - mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 -} - -# call with $1 = "online" to connect to the server, otherwise it bootstraps set_mysql_rootpw() { # forget we ever saw the password. don't use reset to keep the seen status db_set mysql-server/root_password "" @@ -47,9 +42,6 @@ FLUSH PRIVILEGES; EOF if grep -q 'PASSWORD("")' $tfile; then retval=0 - elif [ "$1" = "online" ]; then - mysql --no-defaults -u root -h localhost <$tfile >/dev/null - retval=$? else $MYSQL_BOOTSTRAP <$tfile retval=$? @@ -112,8 +104,10 @@ EOF # Ensure the existence and right permissions for the database and # log files. - if [ ! -d "$mysql_statedir" -a ! -L "$mysql_statedir" ]; then mkdir "$mysql_statedir"; fi - if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi + if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then + # Debian: beware of the bashisms... + /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER + 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. # /var/lib/mysql, you get a .journal file that is not modifyable by chown. @@ -137,17 +131,7 @@ EOF db_set mysql-server/postrm_remove_database false || true # To avoid downgrades. - touch $mysql_statedir/debian-10.0.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 - /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER - set -e + touch $mysql_statedir/debian-10.1.flag ## On every reconfiguration the maintenance user is recreated. # @@ -173,7 +157,9 @@ EOF else pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`; if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi + umask 066 cat /dev/null > $dc + umask 022 echo "# Automatically generated for Debian scripts. DO NOT TOUCH!" >>$dc echo "[client]" >>$dc echo "host = localhost" >>$dc @@ -191,10 +177,6 @@ EOF chown 0:0 $dc chmod 0600 $dc - # update privilege tables - password_column_fix_query=`/bin/echo -e \ - "USE mysql;\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"` replace_query=`/bin/echo -e \ "USE mysql;\n" \ "SET sql_mode='';\n" \ @@ -209,26 +191,15 @@ EOF " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ " ssl_cipher='', x509_issuer='', x509_subject='';"`; - # Engines supported by etch should be installed per default. The query sequence is supposed - # to be aborted if the CREATE TABLE fails due to an already existent table in which case the - # admin might already have chosen to remove one or more plugins. Newlines are necessary. - install_plugins=`/bin/echo -e \ - "USE mysql;\n" \ - "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ - " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` - - # Upgrade password column format before the root password gets set. - echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER db_get mysql-server/root_password && rootpw="$RET" if ! set_mysql_rootpw; then - password_error="yes" + db_input high mysql-server/error_setting_password || true + db_go fi set +e echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER - echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER set -e # If there is a real AppArmor profile, we reload it. @@ -245,6 +216,13 @@ EOF echo "/usr/sbin/mysqld { }" | apparmor_parser --remove 2>/dev/null || true fi fi + + # copy out any mysqld_safe settings + systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf + if [ -x /usr/bin/mariadb-service-convert -a ! -f "${systemd_conf}" ]; then + mkdir -p /etc/systemd/system/mariadb.service.d + /usr/bin/mariadb-service-convert > "${systemd_conf}" + fi ;; abort-upgrade|abort-remove|abort-configure) @@ -256,31 +234,11 @@ EOF ;; esac -# here we check to see if we can connect as root without a password -# this should catch upgrades from previous versions where the root -# password wasn't set. if there is a password, or if the connection -# fails for any other reason, nothing happens. -if [ "$1" = "configure" ]; then - if test_mysql_access; then - db_input medium mysql-server/root_password || true - db_go - db_get mysql-server/root_password && rootpw="$RET" - - if ! set_mysql_rootpw "online"; then - password_error="yes" - fi - fi - - if [ "$password_error" = "yes" ]; then - db_input high mysql-server/error_setting_password || true - db_go - fi - -fi - db_stop # in case invoke failes -# If we upgrade from MySQL mysql.service may be masked, which also +# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mysql. +# Thus MariaDB server is started via init.d script, which in turn redirects to +# systemctl. If we upgrade from MySQL mysql.service may be masked, which also # means init.d script is disabled. Unmask mysql service explicitely. # Check first that the command exists, to avoid emitting any warning messages. if [ -x "$(command -v deb-systemd-helper)" ]; then diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.postrm b/debian/mariadb-server-10.1.postrm index 7cee5150ef9..7cee5150ef9 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.postrm +++ b/debian/mariadb-server-10.1.postrm diff --git a/debian/mariadb-galera-server-10.0.preinst b/debian/mariadb-server-10.1.preinst index 7ad46c6ee52..1df01b2dcee 100644 --- a/debian/mariadb-galera-server-10.0.preinst +++ b/debian/mariadb-server-10.1.preinst @@ -46,19 +46,7 @@ stop_server() { ################################ main() ########################## -this_version=10.0 - -# Abort if an NDB cluster is in use. -if egrep -qi -r '^[^#]*ndb.connectstring|^[[:space:]]*\[[[:space:]]*ndb_mgmd' /etc/mysql/; then - db_fset mysql-server/no_upgrade_when_using_ndb seen false || true - db_input high mysql-server/no_upgrade_when_using_ndb || true - db_go - db_stop - exit 1 -fi - -# Abort if skip-bdb option is enabled, required for 5.0 -> 5.1 upgrades. -#TODO +this_version=10.1 # Safe the user from stupidities. show_downgrade_warning=0 diff --git a/debian/mariadb-galera-server-10.0.prerm b/debian/mariadb-server-10.1.prerm index 03e9ea37420..03e9ea37420 100644 --- a/debian/mariadb-galera-server-10.0.prerm +++ b/debian/mariadb-server-10.1.prerm diff --git a/debian/dist/Ubuntu/mariadb-galera-server-10.0.py b/debian/mariadb-server-10.1.py index d5b94f6e951..fe5029d056c 100644 --- a/debian/dist/Ubuntu/mariadb-galera-server-10.0.py +++ b/debian/mariadb-server-10.1.py @@ -1,4 +1,4 @@ -'''apport package hook for mariadb-10.0 +'''apport package hook for mariadb-10.1 (c) 2009 Canonical Ltd. Author: Mathias Gug <mathias.gug@canonical.com> @@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename): continue def add_info(report): - attach_conffiles(report, 'mariadb-galera-server-10.0', conffiles=None) + attach_conffiles(report, 'mariadb-server-10.1', conffiles=None) key = 'Logs' + path_to_key('/var/log/daemon.log') report[key] = "" for line in read_file('/var/log/daemon.log').split('\n'): diff --git a/debian/mariadb-galera-server-10.0.templates b/debian/mariadb-server-10.1.templates index 13943da534a..f64dd02d7bd 100644 --- a/debian/mariadb-galera-server-10.0.templates +++ b/debian/mariadb-server-10.1.templates @@ -7,7 +7,7 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: mariadb-server-10.0/really_downgrade +Template: mariadb-server-10.1/really_downgrade Type: boolean Default: false _Description: Really proceed with downgrade? @@ -73,7 +73,7 @@ _Description: Unable to set password for the MariaDB "root" user . You should check the account's password after the package installation. . - Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file + Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for more information. Template: mysql-server/password_mismatch @@ -81,9 +81,3 @@ Type: error _Description: Password input error The two passwords you entered were not the same. Please try again. -Template: mysql-server/no_upgrade_when_using_ndb -Type: error -_Description: NDB Cluster seems to be in use - MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new - mysql-cluster package and remove all lines starting with "ndb" from - all config files below /etc/mysql/. diff --git a/debian/mariadb-server-core-10.1.files b/debian/mariadb-server-core-10.1.files new file mode 100644 index 00000000000..5c60ca5ec67 --- /dev/null +++ b/debian/mariadb-server-core-10.1.files @@ -0,0 +1,26 @@ +usr/sbin/mysqld +usr/share/man/man8/mysqld.8 +usr/share/mysql/charsets +usr/share/mysql/czech +usr/share/mysql/danish +usr/share/mysql/dutch +usr/share/mysql/english +usr/share/mysql/estonian +usr/share/mysql/french +usr/share/mysql/german +usr/share/mysql/greek +usr/share/mysql/hungarian +usr/share/mysql/italian +usr/share/mysql/japanese +usr/share/mysql/korean +usr/share/mysql/norwegian +usr/share/mysql/norwegian-ny +usr/share/mysql/polish +usr/share/mysql/portuguese +usr/share/mysql/romanian +usr/share/mysql/russian +usr/share/mysql/serbian +usr/share/mysql/slovak +usr/share/mysql/spanish +usr/share/mysql/swedish +usr/share/mysql/ukrainian diff --git a/debian/mariadb-galera-test-10.0.dirs b/debian/mariadb-test-10.1.dirs index b40bd89463d..b21c5b780f7 100644 --- a/debian/mariadb-galera-test-10.0.dirs +++ b/debian/mariadb-test-10.1.dirs @@ -19,9 +19,6 @@ usr/share/mysql/mysql-test/suite/parts usr/share/mysql/mysql-test/suite/parts/inc usr/share/mysql/mysql-test/suite/parts/t usr/share/mysql/mysql-test/suite/parts/r -usr/share/mysql/mysql-test/suite/rpl_ndb -usr/share/mysql/mysql-test/suite/rpl_ndb/t -usr/share/mysql/mysql-test/suite/rpl_ndb/r usr/share/mysql/mysql-test/suite/bugs usr/share/mysql/mysql-test/suite/bugs/t usr/share/mysql/mysql-test/suite/bugs/r @@ -46,9 +43,6 @@ 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/ndb -usr/share/mysql/mysql-test/suite/ndb/t -usr/share/mysql/mysql-test/suite/ndb/r usr/share/mysql/mysql-test/suite/maria usr/share/mysql/mysql-test/suite/funcs_2 usr/share/mysql/mysql-test/suite/funcs_2/lib @@ -61,9 +55,6 @@ usr/share/mysql/mysql-test/suite/binlog usr/share/mysql/mysql-test/suite/binlog/t usr/share/mysql/mysql-test/suite/binlog/r usr/share/mysql/mysql-test/suite/binlog/std_data -usr/share/mysql/mysql-test/suite/ndb_team -usr/share/mysql/mysql-test/suite/ndb_team/t -usr/share/mysql/mysql-test/suite/ndb_team/r usr/share/mysql/mysql-test/suite/federated usr/share/mysql/mysql-test/suite/funcs_1 usr/share/mysql/mysql-test/suite/funcs_1/cursors @@ -84,16 +75,6 @@ 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/suite/wsrep -usr/share/mysql/mysql-test/suite/wsrep/t -usr/share/mysql/mysql-test/suite/wsrep/r -usr/share/mysql/mysql-test/suite/galera -usr/share/mysql/mysql-test/suite/galera/t -usr/share/mysql/mysql-test/suite/galera/r usr/share/mysql/mysql-test/std_data -usr/share/mysql/mysql-test/std_data/ndb_backup50 usr/share/mysql/mysql-test/std_data/parts -usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le -usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be -usr/share/mysql/mysql-test/std_data/ndb_backup51 usr/share/mysql/mysql-test/std_data/funcs_1 diff --git a/debian/mariadb-galera-test-10.0.files b/debian/mariadb-test-10.1.files index 0d5fb2ba8dd..dbb551a9407 100644 --- a/debian/mariadb-galera-test-10.0.files +++ b/debian/mariadb-test-10.1.files @@ -1,3 +1,5 @@ +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/auth_test_plugin.so usr/lib/mysql/plugin/qa_auth_interface.so @@ -11,7 +13,11 @@ usr/lib/mysql/plugin/daemon_example.ini usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/adt_null.so usr/bin/mysql_client_test +usr/bin/mysql_client_test_embedded +usr/bin/mysqltest_embedded usr/share/man/man1/mysql_client_test.1 +usr/share/man/man1/mysql_client_test_embedded.1 usr/bin/mysqltest usr/share/man/man1/mysqltest.1 +usr/share/man/man1/mysqltest_embedded.1 usr/share/mysql/mysql-test diff --git a/debian/mariadb-galera-test-10.0.links b/debian/mariadb-test-10.1.links index 082680fe5ed..082680fe5ed 100644 --- a/debian/mariadb-galera-test-10.0.links +++ b/debian/mariadb-test-10.1.links diff --git a/debian/mysql-common.dirs b/debian/mysql-common.dirs new file mode 100644 index 00000000000..a5a88ede9c1 --- /dev/null +++ b/debian/mysql-common.dirs @@ -0,0 +1 @@ +etc/mysql/conf.d/ diff --git a/debian/mysql-common.files b/debian/mysql-common.files new file mode 100644 index 00000000000..c052beb0027 --- /dev/null +++ b/debian/mysql-common.files @@ -0,0 +1,2 @@ +etc/mysql/my.cnf +usr/share/mysql-common/internal-use-only diff --git a/debian/mysql-common.postrm b/debian/mysql-common.postrm new file mode 100644 index 00000000000..0d3f8aed83d --- /dev/null +++ b/debian/mysql-common.postrm @@ -0,0 +1,7 @@ +#!/bin/bash -e + +if [ "$1" = "purge" ]; then + rmdir /etc/mysql 2>/dev/null || true +fi + +#DEBHELPER# diff --git a/debian/patches/00list b/debian/patches/00list index 77c159a17ed..1346748eba1 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,11 +1,10 @@ # 01_MAKEFILES__Docs_Images_Makefile.in.dpatch # 01_MAKEFILES__Docs_Makefile.in.dpatch -# 02_no_builtin_ndbcluster_plugin.dpatch # 21_init__openquery_configtest.dpatch 33_scripts__mysql_create_system_tables__no_test.dpatch 38_scripts__mysqld_safe.sh__signals.dpatch 41_scripts__mysql_install_db.sh__no_test.dpatch -44_scripts__mysql_config__libs.dpatch +# 44_scripts__mysql_config__libs.dpatch 50_mysql-test__db_test.dpatch # 60_zlib_innodb_workaround.dpatch 61_replace_dash_with_bash_mbug675185.dpatch diff --git a/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch b/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch deleted file mode 100644 index dc881ccca10..00000000000 --- a/debian/patches/02_no_builtin_ndbcluster_plugin.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_no_builtin_ndbcluster_plugin.dpatch by <ch@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: As we completely disabled ndbcluster - -@DPATCH@ - ---- old/sql/sql_builtin.cc -+++ new/sql/sql_builtin.cc -@@ -22,6 +22,6 @@ - - struct st_mysql_plugin *mysqld_builtins[]= - { -- builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, builtin_ndbcluster_plugin,(struct st_mysql_plugin *)0 -+ builtin_binlog_plugin, builtin_partition_plugin, builtin_csv_plugin, builtin_heap_plugin, builtin_myisam_plugin, builtin_myisammrg_plugin, (struct st_mysql_plugin *)0 - }; - diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch index 7ce692a96b0..6547e4434f1 100755 --- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch +++ b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch @@ -27,10 +27,10 @@ -- Fill "user" table with default users allowing root access -- from local machine if "user" table didn't exist before CREATE TEMPORARY TABLE tmp_user LIKE user; -@@ -43,8 +33,6 @@ INSERT INTO tmp_user VALUES ('localhost' - REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE @current_hostname != 'localhost'; - REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N'); - REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N'); +@@ -43,8 +33,6 @@ INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y',' + REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N','',0 FROM dual WHERE @current_hostname != 'localhost'; + REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N','',0); + REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0); -INSERT INTO tmp_user (host,user) VALUES ('localhost',''); -INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 804bf154b9b..029c650fe7a 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mariadb-galera-server-10.0.templates +[type: gettext/rfc822deb] mariadb-server-10.1.templates diff --git a/debian/po/ar.po b/debian/po/ar.po index aeb18dcc9fd..c9009069ee5 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" @@ -27,19 +27,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "هل فعلاً تريد التثبيط؟" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "هناك ملف مسمى /var/lib/mysql/debian-*.flag موجود على هذا النظام." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -52,7 +52,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -62,13 +62,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "ملاحظة هامة لمستخدمي NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -76,7 +76,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -88,13 +88,13 @@ msgstr "عليك أيضاً أن تقوم بالتأكد من صلاحيات م #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "إزالة جميع قواعد بيانات MariaDB؟" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -102,7 +102,7 @@ msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -113,13 +113,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "تشغيل خادم MariaDB عند الإقلاع؟" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -129,13 +129,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -145,7 +145,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -153,7 +153,7 @@ msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MariaDB \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -161,13 +161,13 @@ msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص ب #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +179,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,45 +188,30 @@ msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.0/README.Debian للمزيد من " +"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.1/README.Debian للمزيد من " "المعلومات." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/ca.po b/debian/po/ca.po index 8814257569f..7c7d2210834 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2004-01-31 19:20GMT\n" "Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n" @@ -17,19 +17,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -37,7 +37,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -45,7 +45,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -53,7 +53,7 @@ msgstr "Nota important pels usuaris de NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +61,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -69,13 +69,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -83,7 +83,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -92,7 +92,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "Should MySQL start on boot?" msgid "Start the MariaDB server on boot?" @@ -100,7 +100,7 @@ msgstr "Voleu que el MariaDB s'inici a l'arrencada ?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy msgid "" "The MariaDB server can be launched automatically at boot time or manually " @@ -112,13 +112,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -126,25 +126,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -153,45 +153,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #, fuzzy #~ msgid "" #~ "To use mysql you must install an equivalent user and group to the " @@ -222,13 +207,13 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "El MySQL noms s'installa en cas de tenir un nom d'ordinador central que " #~ "no sigui numric i que es pugui resoldre a travs del fitxer /etc/hosts. " #~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver " -#~ "una lnia com la segent \"10.0.0.1 myhostname\"." +#~ "una lnia com la segent \"10.1.0.1 myhostname\"." #, fuzzy #~ msgid "" diff --git a/debian/po/cs.po b/debian/po/cs.po index c1ce4ccc17e..f3ae24b1e8c 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-05-01 13:01+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" @@ -26,19 +26,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Opravdu pokračovat v degradaci?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "V systému existuje soubor /var/lib/mysql/debian-*.flag." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -51,7 +51,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -61,13 +61,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Důležitá poznámka pro uživatele NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -75,7 +75,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -88,13 +88,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Odstranit všechny MariaDB databáze?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -104,7 +104,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -116,13 +116,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Spustit MariaDB server při startu systému?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -132,13 +132,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nové heslo MariaDB uživatele \"root\":" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -148,7 +148,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -156,7 +156,7 @@ msgstr "Ponecháte-li pole prázdné, heslo se nezmění." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -164,13 +164,13 @@ msgstr "Nové heslo MariaDB uživatele \"root\":" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Nelze nastavit heslo MariaDB uživatele \"root\"" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -182,7 +182,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -191,44 +191,29 @@ msgstr "Po instalaci balíku byste měli heslo ověřit." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Více informací naleznete v /usr/share/doc/mariadb-server-10.0/README.Debian." +"Více informací naleznete v /usr/share/doc/mariadb-server-10.1/README.Debian." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" @@ -313,13 +298,13 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno " #~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz " #~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný " -#~ "řádek jako \"10.0.0.1 diamond\"." +#~ "řádek jako \"10.1.0.1 diamond\"." #~ msgid "" #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " diff --git a/debian/po/da.po b/debian/po/da.po index bcc50345cd3..d68b8575d72 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-05-30 22:41+0200\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" @@ -27,20 +27,20 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "nsker du virkelig at fortstte nedgraderingen?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -54,7 +54,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -64,13 +64,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Vigtig oplysning til NIS/YP-brugere" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -78,7 +78,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -91,13 +91,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Fjern alle MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -107,7 +107,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -119,13 +119,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Start MariaDB-serveren under systemopstart?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -135,13 +135,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -151,7 +151,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -159,7 +159,7 @@ msgstr "Hvis du lader dette felt st tomt, vil adgangskoden ikke blive ndret." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -167,13 +167,13 @@ msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -186,51 +186,36 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Se filen /usr/share/doc/mariadb-server-10.0/README.Debian for yderligere " +"Se filen /usr/share/doc/mariadb-server-10.1/README.Debian for yderligere " "oplysninger." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" @@ -339,12 +324,12 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "MySQL vil kun blive installeret, hvis du har et ikke-numerisk vrtsnavn, " #~ "som kan sls op i filen /ets/hosts. Hvis f.eks. kommandoen \"hostname\" " -#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.0.0.1 " +#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.1.0.1 " #~ "mitvaertsnavn\" i /etc/hosts." #~ msgid "" diff --git a/debian/po/de.po b/debian/po/de.po index f8d4dc7a895..6147b55903e 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-08-27 22:41+0200\n" "Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n" @@ -29,13 +29,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Möchten Sie wirklich eine ältere Version einspielen?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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-*." @@ -43,7 +43,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -53,7 +53,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -63,13 +63,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Wichtige Anmerkung für NIS/YP-Benutzer!" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -79,7 +79,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -89,13 +89,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Alle MariaDB-Datenbanken entfernen?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -105,7 +105,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -117,13 +117,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Soll der MariaDB-Server automatisch beim Booten starten?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -133,13 +133,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Neues Passwort für den MariaDB »root«-Benutzer:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -149,25 +149,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 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." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -180,7 +180,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "Sie sollten das Passwort des administrativen Benutzers nach der " @@ -188,13 +188,13 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" "Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." @@ -202,33 +202,15 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Passwort-Eingabefehler" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " "erneut versuchen." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB-Cluster scheint gerade benutzt zu werden" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"MySQL-5.1 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie " -"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, " -"die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/" -"mysql/." diff --git a/debian/po/es.po b/debian/po/es.po index e88bcf1aa87..e76c173a9f5 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-05-28 22:21+0200\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" @@ -52,20 +52,20 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "¿Desea realmente continuar con la desactualización?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -79,7 +79,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -89,13 +89,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para los usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -103,7 +103,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -117,13 +117,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Desea eliminar todas las bases de datos MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -133,7 +133,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -145,13 +145,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "¿Debería ejecutarse el servidor MariaDB al iniciarse el sistema?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -161,13 +161,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -177,7 +177,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -185,7 +185,7 @@ msgstr "No se modificará la contraseña si deja el espacio en blanco." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -193,13 +193,13 @@ msgstr "Nueva contraseña para el usuario «root» de MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -212,7 +212,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "Debería comprobar la contraseña de la cuenta después de la instalación del " @@ -220,45 +220,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Consulte /usr/share/doc/mariadb-server-10.0/README.Debian para más " +"Consulte /usr/share/doc/mariadb-server-10.1/README.Debian para más " "información." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" @@ -356,13 +341,13 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una " #~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por " #~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá " -#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo." +#~ "existir una línea «10.1.0.1 MiNombreEquipo» en dicho archivo." #~ msgid "" #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " diff --git a/debian/po/eu.po b/debian/po/eu.po index a62bf4c3d5c..8f1ae0c8ecd 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" @@ -20,19 +20,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Benetan bertsio zaharragora itzuli nahi duzu?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "Sisteman badago /var/lib/mysql/debian-*.flag izeneko fitxategi bat." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -46,7 +46,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -56,13 +56,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -70,7 +70,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -84,13 +84,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ezabatu MariaDB datubase guztiak?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -99,7 +99,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -111,13 +111,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Abioan MariaDB zerbitzaria abiarazi?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -127,13 +127,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -143,7 +143,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -151,19 +151,19 @@ msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,60 +175,37 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Mesedez irakurri /usr/share/doc/mariadb-server-10.0/README.Debian fitxategia " +"Mesedez irakurri /usr/share/doc/mariadb-server-10.1/README.Debian fitxategia " "xehetasun gehiagorako." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Pasahitz sarrera errorea" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Dirudienez NDB Cluster-a erabilia dago" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -#, fuzzy -#| msgid "" -#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new " -#| "mysql-cluster package and remove all lines starting with \"ndb\" from all " -#| "config files below /etc/mysql/." -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"MySQL-5.1-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu " -"mysql-cluster pakete berrira eta /etc/mysql/ azpiko konfigurazio fitxategi " -"guztietan \"ndb\"-ez hasten diren lerro guztiak ezabatu." - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/fr.po b/debian/po/fr.po index f2f87a915dd..98d6740b7e2 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-08-08 14:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" @@ -22,19 +22,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Faut-il vraiment revenir à la version précédente ?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -44,7 +44,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -52,13 +52,13 @@ msgstr "Il n'est pas garanti que cette version puisse en utiliser les données." #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Note importante pour les utilisateurs NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -68,7 +68,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -78,13 +78,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Faut-il supprimer toutes les bases de données MariaDB ?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -94,7 +94,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -105,13 +105,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Faut-il lancer MariaDB au démarrage ?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -121,13 +121,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -137,26 +137,26 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 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é." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" "Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -168,7 +168,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "Vous devriez vérifier le mot de passe de ce compte après l'installation du " @@ -176,50 +176,32 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.0/README.Debian " +"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.1/README.Debian " "pour plus d'informations." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Erreur de saisie du mot de passe" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" "Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " "recommencer." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Abandon de la gestion de NDB" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"La version 5.1 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser " -"le paquet mysql-cluster et supprimer toutes les lignes commençant par " -"« ndb » des fichiers de configuration situés dans /etc/mysql." - #~ msgid "" #~ "To use MySQL, the following entries for users and groups should be added " #~ "to the system:" diff --git a/debian/po/gl.po b/debian/po/gl.po index c3d399a3642..122e4091c16 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" @@ -17,19 +17,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "¿Quere pasar a unha versión anterior?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -43,7 +43,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -53,13 +53,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para os usuarios de NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -67,7 +67,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -81,13 +81,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "¿Eliminar tódalas bases de datos de MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +97,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -109,13 +109,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "¿Iniciar o servidor MariaDB co ordenador?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -125,13 +125,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -141,7 +141,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -149,7 +149,7 @@ msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -157,13 +157,13 @@ msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,7 +175,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -184,45 +184,30 @@ msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete. #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Consulte o ficheiro /usr/share/doc/mariadb-server-10.0/README.Debian para " +"Consulte o ficheiro /usr/share/doc/mariadb-server-10.1/README.Debian para " "máis información." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/it.po b/debian/po/it.po index 0feaa77a45f..459099cbc6a 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -2,11 +2,11 @@ # Copyright (C) 2009 Software in the Public Interest # This file is distributed under the same license as the mysql-dfsg-5.1 package. # Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009. -# +# msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-08-08 11:03+0200\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" @@ -18,20 +18,20 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Procedere realmente con l'abbassamento di versione?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -41,7 +41,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -51,13 +51,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante per gli utenti NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -67,7 +67,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -77,13 +77,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Eliminare tutti i database MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -93,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -105,13 +105,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Lanciare il server MariaDB all'avvio?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -121,13 +121,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nuova password per l'utente «root» di MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -137,25 +137,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Ripetere la password per l'utente «root» di MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Impossibile impostare la password per l'utente «root» di MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -168,48 +168,34 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "Al termine dell'installazione si deve verificare la password dell'account." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy +#| msgid "" +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" "Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" -"server-10.0/README.Debian." +"server-10.1/README.Debian." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Errore di inserimento della password" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Le due password inserite sono diverse. Riprovare." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "È in uso un cluster NDB" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe " -"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che " -"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/." diff --git a/debian/po/ja.po b/debian/po/ja.po index 692c2e3686c..c1087266eaf 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-09-01 08:25+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" @@ -27,13 +27,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "本当にダウングレードを実行しますか?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" "このシステムには /var/lib/mysql/debian-*.flag という名前のファイルが存在して" @@ -41,7 +41,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -51,7 +51,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -61,13 +61,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "NIS/YP ユーザへの重要な注意" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -77,7 +77,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -85,13 +85,13 @@ msgstr "/var/lib/mysql の所有者権限をチェックする必要もありま #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "すべての MariaDB データベースを削除しますか?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -101,7 +101,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -113,13 +113,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "MariaDB をシステム起動時に開始しますか?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -129,13 +129,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -145,25 +145,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -175,50 +175,33 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" "パッケージのインストール後、アカウントのパスワードを確認する必要があります。" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"詳細は /usr/share/doc/mariadb-server-10.0/README.Debian を参照してください。" +"詳細は /usr/share/doc/mariadb-server-10.1/README.Debian を参照してください。" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "パスワード入力エラー" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "入力された二つのパスワードが一致しません。再入力してください。" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB クラスタが利用されているようです" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"MySQL-5.1 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-" -"cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」" -"で始まる行を削除してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index e8509bea43b..992684fa3e1 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" @@ -19,7 +19,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "Do you really want to downgrade?" msgid "Really proceed with downgrade?" @@ -27,13 +27,13 @@ msgstr "Er du sikker på at du vil nedgradere?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " @@ -50,7 +50,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -58,7 +58,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +66,7 @@ msgstr "Viktig merknad for NIS/YP-brukere!" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +74,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +96,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -113,7 +113,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "Should MySQL start on boot?" msgid "Start the MariaDB server on boot?" @@ -121,7 +121,7 @@ msgstr "Skal MariaDB startes ved maskinoppstart?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "" #| "The MySQL can start automatically on boot time or only if you manually " @@ -135,7 +135,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -143,7 +143,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -157,13 +157,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -171,7 +171,7 @@ msgstr "Nytt passord for MariaDBs «root»-bruker:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +179,7 @@ msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,45 +198,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index accf69555ef..82864ed8456 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2006-02-19 10:20+0100\n" "Last-Translator: Thijs Kinkhorst <thijs@debian.org>\n" @@ -18,7 +18,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "Do you really want to downgrade?" msgid "Really proceed with downgrade?" @@ -26,13 +26,13 @@ msgstr "Wilt u echt een oude versie herstellen?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " @@ -50,7 +50,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -58,7 +58,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +66,7 @@ msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +74,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +96,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -114,7 +114,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "Should MySQL start on boot?" msgid "Start the MariaDB server on boot?" @@ -122,7 +122,7 @@ msgstr "Moet MariaDB starten als de computer start?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "" #| "The MySQL can start automatically on boot time or only if you manually " @@ -136,7 +136,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -144,7 +144,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -158,13 +158,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -172,7 +172,7 @@ msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -180,7 +180,7 @@ msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -199,45 +199,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?" #~ msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 7be7dde415b..0c35c038b70 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-05-05 21:01+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" @@ -18,19 +18,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Deseja mesmo fazer downgrade?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -44,7 +44,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -54,13 +54,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Nota importante para utilizadores de NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -68,7 +68,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -81,13 +81,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -97,7 +97,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -109,13 +109,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Iniciar o servidor MariaDB no arranque?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -125,13 +125,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -141,7 +141,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -150,7 +150,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -158,7 +158,7 @@ msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" "Não foi possível definir a palavra-passe para o utilizador \"root\" do " @@ -166,7 +166,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +179,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -189,45 +189,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" "Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" -"server-10.0/README.Debian." +"server-10.1/README.Debian." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index dd8fb9c1f15..a0b4cdbfbfb 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2007-04-21 15:59-0300\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" @@ -21,19 +21,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Realmente proceder com o rebaixamento de versão?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 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." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "Such file is an indication that a mariadb-server package with a higher " @@ -47,7 +47,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -57,13 +57,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Aviso importante para usuários NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -71,7 +71,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "" #| "You should also check the permissions and the owner of the /var/lib/mysql " @@ -84,13 +84,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Remover todas as bases de dados do MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -100,7 +100,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -112,13 +112,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.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-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -128,13 +128,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nova senha para o usuário \"root\" do MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -144,7 +144,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| 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." @@ -152,7 +152,7 @@ msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for the MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -160,13 +160,13 @@ msgstr "Nova senha para o usuário \"root\" do MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Impossível definir senha para o usuário \"root\" do MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -179,7 +179,7 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "You should check the account's password after tha package installation." @@ -188,45 +188,30 @@ msgstr "Você deverá checar a senha dessa conta após a instalação deste paco #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.0/README.Debian " +"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.1/README.Debian " "para maiores informações." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use MariaDB, the following entries for users and groups should be " #~ "added to the system:" @@ -323,13 +308,13 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "O MySQL será instalado somente caso você possua um nome de host NÃO " #~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, " #~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como " -#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts." +#~ "\"10.1.0.1 myhostname\" deverá existir no arquivo /etc/hosts." #~ msgid "" #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account " diff --git a/debian/po/ro.po b/debian/po/ro.po index ec71d628021..ceefecc8a1b 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n" "Last-Translator: stan ioan-eugen <stan.ieugen@gmail.com>\n" @@ -19,7 +19,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "Do you really want to downgrade?" msgid "Really proceed with downgrade?" @@ -27,13 +27,13 @@ msgstr "Sunteţi sigur că doriţi să instalaţi o versiune mai veche?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 #, fuzzy #| msgid "" #| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates " @@ -50,7 +50,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -58,7 +58,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -66,7 +66,7 @@ msgstr "Notă importantă pentru utilizatorii NIS/YP!" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -74,7 +74,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -82,13 +82,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -96,7 +96,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 #, fuzzy #| msgid "" #| "The script is about to remove the data directory /var/lib/mysql. If it is " @@ -113,7 +113,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "Should MySQL start on boot?" msgid "Start the MariaDB server on boot?" @@ -121,7 +121,7 @@ msgstr "Doriţi ca MariaDB să pornească la initializarea sistemului?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "" #| "The MySQL can start automatically on boot time or only if you manually " @@ -135,7 +135,7 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "New password for the MariaDB \"root\" user:" @@ -143,7 +143,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 #, fuzzy #| msgid "" #| "It is highly recommended that you set a password for the MySQL " @@ -157,13 +157,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 #, fuzzy #| msgid "New password for MySQL \"root\" user:" msgid "Repeat password for the MariaDB \"root\" user:" @@ -171,7 +171,7 @@ msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "Unable to set password for MySQL \"root\" user" msgid "Unable to set password for the MariaDB \"root\" user" @@ -179,7 +179,7 @@ msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" #| "It seems an error occurred while setting the password for the MySQL " @@ -198,45 +198,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "Cannot upgrade if ISAM tables are present!" #~ msgstr "Nu se poate face actualizarea dacă sunt prezente tabele ISAM!" diff --git a/debian/po/ru.po b/debian/po/ru.po index d555c6b086d..5136933159b 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-08-06 20:27+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" @@ -32,19 +32,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Действительно установить более старую версию?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "В системе найден файл /var/lib/mysql/debian-*.flag." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -54,7 +54,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -64,13 +64,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Важное замечание для пользователей NIS/YP" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -80,7 +80,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -88,13 +88,13 @@ msgstr "Также проверьте права доступа и владел #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Удалить все базы данных MariaDB?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -103,7 +103,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -115,13 +115,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Запускать MariaDB при загрузке системы?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -131,13 +131,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Новый пароль для MariaDB пользователя \"root\":" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -147,25 +147,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "Если оставить поле пустым, то пароль изменён не будет." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Невозможно задать пароль MariaDB пользователю \"root\"" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -177,49 +177,32 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "Проверьте пароль учётной записи после установки пакета." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy #| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " #| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Подробности см. в файле /usr/share/doc/mariadb-server-10.0/README.Debian." +"Подробности см. в файле /usr/share/doc/mariadb-server-10.1/README.Debian." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Ошибка ввода пароля" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "Два введённых пароля не одинаковы. Повторите ввод." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB Cluster уже используется" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"MySQL-5.1 больше не поддерживает NDB Cluster. Переходите на новый пакет " -"mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов " -"настройки в каталоге /etc/mysql/." diff --git a/debian/po/sv.po b/debian/po/sv.po index fe21df1e229..0cd512a252b 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,13 +1,13 @@ # Translation of mysql-dfsg-5.1 debconf template to Swedish # Copyright (C) 2009 Martin Bagge <brother@bsnet.se> # This file is distributed under the same license as the mysql-dfsg-5.1 package. -# +# # Andreas Henriksson <andreas@fatal.se>, 2007 # Martin Bagge <brother@bsnet.se>, 2009 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2009-09-08 21:42+0100\n" "Last-Translator: Martin Bagge <brother@bsnet.se>\n" @@ -21,19 +21,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Vill du verkligen genomföra nedgraderingen?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet." #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -43,7 +43,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -53,13 +53,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "Viktig information för NIS/YP-användare" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -69,7 +69,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -79,13 +79,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Ta bort alla MariaDB-databaser?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -95,7 +95,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -107,13 +107,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Ska MariaDB startas vid systemets uppstart?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -123,13 +123,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "Nytt lösenord för MariaDBs \"root\"-användare:" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -139,25 +139,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras." #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -170,51 +170,36 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 #, fuzzy +#| msgid "" +#| "Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " +#| "more information." msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" -"Läs filen /usr/share/doc/mariadb-server-10.0/README.Debian för mer " +"Läs filen /usr/share/doc/mariadb-server-10.1/README.Debian för mer " "information." #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Fel vid inmatning av lösenord" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "De två lösenorden du angav stämde inte överrens. Prova igen." -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB-kluster används inte" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" -"Stödet för NDB-kluster har tagits bort i MySQL-5.1. Migrera till det nya " -"paketet mysql-cluster och ta bort alla rader som inleds med \"ndb\" från " -"alla inställlningsfiler i /etc/mysql/." - #~ msgid "" #~ "To use MySQL, the following entries for users and groups should be added " #~ "to the system:" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index c67429d7706..c164f1f4811 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" @@ -19,19 +19,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -39,7 +39,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -47,13 +47,13 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -61,7 +61,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -69,13 +69,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -83,7 +83,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -92,13 +92,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "" "The MariaDB server can be launched automatically at boot time or manually " "with the '/etc/init.d/mysql start' command." @@ -106,13 +106,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -120,25 +120,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -147,41 +147,26 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index 789ff9f8e2b..814341a6bc2 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-4.1\n" -"Report-Msgid-Bugs-To: mariadb-10.0@packages.debian.org\n" +"Report-Msgid-Bugs-To: mariadb-10.1@packages.debian.org\n" "POT-Creation-Date: 2012-01-12 13:08+0100\n" "PO-Revision-Date: 2004-06-05 08:53+0300\n" "Last-Translator: Gürkan Aslan <gurkan@iaslan.com>\n" @@ -18,19 +18,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system." msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "Such a file is an indication that a mariadb-server package with a higher " "version has been installed previously." @@ -38,7 +38,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "" "There is no guarantee that the version you're currently installing will be " "able to use the current databases." @@ -46,7 +46,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 #, fuzzy #| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" @@ -54,7 +54,7 @@ msgstr "NIS/YP kullanıcıları için önemli not!" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" @@ -62,7 +62,7 @@ msgstr "" #. Type: note #. Description -#: ../mariadb-galera-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -70,13 +70,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." @@ -84,7 +84,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " @@ -93,7 +93,7 @@ msgstr "" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy #| msgid "Should MySQL start on boot?" msgid "Start the MariaDB server on boot?" @@ -101,7 +101,7 @@ msgstr "MariaDB açılış sırasında başlatılsın mı?" #. Type: boolean #. Description -#: ../mariadb-galera-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 #, fuzzy msgid "" "The MariaDB server can be launched automatically at boot time or manually " @@ -113,13 +113,13 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "" "While not mandatory, it is highly recommended that you set a password for " "the MariaDB administrative \"root\" user." @@ -127,25 +127,25 @@ msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "If this field is left blank, the password will not be changed." msgstr "" #. Type: password #. Description -#: ../mariadb-galera-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "Unable to set password for the MariaDB \"root\" user" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" "An error occurred while setting the password for the MariaDB administrative " "user. This may have happened because the account already has a password, or " @@ -154,45 +154,30 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "You should check the account's password after the package installation." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:8001 +#: ../mariadb-server-10.1.templates:8001 msgid "" -"Please read the /usr/share/doc/mariadb-server-10.0/README.Debian file for " +"Please read the /usr/share/doc/mariadb-server-10.1/README.Debian file for " "more information." msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-galera-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "The two passwords you entered were not the same. Please try again." msgstr "" -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-galera-server-10.0.templates:10001 -msgid "" -"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new " -"mysql-cluster package and remove all lines starting with \"ndb\" from all " -"config files below /etc/mysql/." -msgstr "" - #~ msgid "" #~ "To use mysql you must install an equivalent user and group to the " #~ "following and ensure yourself that /var/lib/mysql has the right " @@ -221,12 +206,12 @@ msgstr "" #~ msgid "" #~ "MySQL will only install if you have a non-numeric hostname that is " #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command " -#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 " +#~ "returns \"myhostname\" then there must be a line like \"10.1.0.1 " #~ "myhostname\"." #~ msgstr "" #~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir " #~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu " -#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" " +#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.1.0.1 makinem\" " #~ "gibi bir satır olmalıdır." #, fuzzy diff --git a/debian/dist/Ubuntu/rules b/debian/rules index ae89db84f48..1c824626dca 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 -PACKAGE=mariadb-10.0 +PACKAGE=mariadb-10.1 include /usr/share/dpatch/dpatch.make @@ -161,43 +161,39 @@ install: build install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/ install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/ - # mariadb-galera-server + # mariadb-server install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe - mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples + mkdir -p $(TMP)/usr/share/doc/mariadb-server-10.1/examples # We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf) - # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-galera-server-10.0/examples/ + # $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mariadb-server-10.1/examples/ rm -vf $(TMP)/usr/share/mysql/my-*.cnf \ $(TMP)/usr/share/mysql/config-*.cnf \ $(TMP)/usr/share/mysql/mi_test_all* \ $(TMP)/usr/share/mysql/mysql-log-rotate \ $(TMP)/usr/share/mysql/mysql.server \ $(TMP)/usr/share/mysql/binary-configure - nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-galera-server-10.0/mysqld.sym.gz + nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/ install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/ - install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-10.0/INFO_BIN + install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_SRC + install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-10.1/INFO_BIN # mariadb-test mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql - # lintian overrides - mkdir -p $(TMP)/usr/share/lintian/overrides/ - cp debian/mariadb-galera-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0 - - # For 5.0 -> 10.0 transition + # For 5.0 -> 10.1 transition d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ mkdir -p $$d; \ - cp debian/mariadb-galera-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-galera-server-10.0.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ + cp debian/mariadb-server-10.1.mysql.init $$d/_etc_init.d_mysql; \ + cp debian/mariadb-server-10.1.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ cp debian/additions/debian-start $$d/_etc_mysql_debian-start; # install AppArmor profile install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld # install Apport hook - install -D -m 644 debian/mariadb-galera-server-10.0.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.0.py + install -D -m 644 debian/mariadb-server-10.1.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.1.py autorm=debian/autorm-file; \ rm -f $$autorm; \ @@ -245,9 +241,12 @@ binary-arch: build install dh_installexamples -a dh_installmenu -a dh_installlogrotate -a --name mysql-server + if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_enable -pmariadb-server-10.1 mariadb.service; fi + if [ -x /usr/bin/dh_systemd_enable -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb@.service ]; then dh_systemd_enable --no-enable -pmariadb-server-10.1 mariadb@.service; fi # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets # started which might depend on a running database server. dh_installinit -a --name=mysql -- defaults 19 21 + if [ -x /usr/bin/dh_systemd_start -a -f debian/mariadb-server-10.1/lib/systemd/system/mariadb.service ]; then dh_systemd_start -pmariadb-server-10.1 --restart-after-upgrade mariadb.service; fi dh_installcron -a --name mysql-server dh_installman -a dh_installinfo -a diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides deleted file mode 100644 index d2ba378fb63..00000000000 --- a/debian/source.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postinst -maintainer-script-lacks-debhelper-token debian/mariadb-server-10.0.postrm diff --git a/debian/watch b/debian/watch deleted file mode 100644 index f6fdd67bd8d..00000000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/-(rc|beta)/$1/" \ - ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/Downloads/MySQL-5.1/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian |