diff options
Diffstat (limited to 'debian')
86 files changed, 3344 insertions, 2827 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/innotop/changelog.innotop b/debian/additions/innotop/changelog.innotop index ab4c154d6e6..67bc52698e7 100644 --- a/debian/additions/innotop/changelog.innotop +++ b/debian/additions/innotop/changelog.innotop @@ -1,10 +1,94 @@ Changelog for innotop: +2017-01-20: version 1.11.4 + * add SUM function for ONLY_FULL_GROUP_BY + +2017-01-20: version 1.11.3 + + * Undisplay handlersocket's threads in hide_inactive + * fix runtime error regarding redundant sprintf argument #122 + * added sort on connection-name in display M, after sql/io running, seconds behind master and channel_name + * fixed bug that removed value for cxn and channel_name columns in display M + * added sort on replication delay, so that the replication-display will sort on slave_sql_running, timelag (in minutes) and channel_name. + * support for MariaDB 10.0 in InnoDB row (issue 93) + +2013-07-12: version 1.9.1 + + Bugs fixed: + * Support of MySQL 5.6 was broken on some pages (issue 82, 83) + * Deadlock clearing transactions is now not included in binary log + (issue 84) + * New spec file with requirements and build requirements for + CentOS/RHEL and Fedora + +2012-09-07: version 1.9.0 + + Changes: + * A new Health Dashboard (A) mode is the default mode. + * Added a new InnoDB Locked (K) mode. + * Added a new 'spark' config variable for sparklines. + * Added a new fuzzy_time formatting function. + * Added "query distill" summarizing. + * Handled more types of errors connecting to the server. + * Displayed some data more compactly. + + Bugs fixed: + * Double-quotes were used to terminate strings in SQL (issue 57). + * T mode didn't show InnoDB transaction times (issue 67). + * Killing a query didn't suggest the longest-running one automatically. + * Connections weren't closed on exit (issue 64). + * Q mode didn't have connections in its header (issue 63). + * Connections and server groups were poorly handled (issue 68). + * The RPM spec file was buggy (issue 59). + * Event filters were defined wrong (issue 54). + +2012-02-25: version 1.8.1 + + Bugs fixed: + * Various parsing errors with MySQL 5.5 (issue 23, 45, 47, 51, 52, 53). + * RPM spec file prevented building on CentOS 5.5 using mock (issue 44). + * Tests worked only from the test subdirectory (issue 43). + +2010-11-06: version 1.8.0 + + Changes: + * Don't re-fetch SHOW VARIABLES every iteration; it's too slow on many hosts. + * Add a filter to remove EVENT threads in SHOW PROCESSLIST (issue 32). + * Add a timestamp to output in -n mode, when -t is specified (issue 37). + * Add a new U mode, for Percona/MariaDB USER_STATISTICS (issue 39). + * Add support for millisecond query time in Percona Server (issue 39). + * Display a summary of queries executed in Query List mode (issue 26). + + Bugs fixed: + * Made config-file reading more robust (issue 41). + * Hostname parsing wasn't standards compliant (issue 30). + * MKDEBUG didn't work on some Perl versions (issue 22). + * Don't try to get InnoDB status if have_innodb != YES (issue 33). + * Status text from the InnoDB plugin wasn't parsed correctly (issue 36). + * Transaction ID from InnoDB plugin wasn't subtracted correctly (issue 38). + * Switching modes and pressing ? for help caused a crash (issue 40). + +2009-09-06: version 1.7.2 + + Changes: + * add support for --socket + + Bugs fixed: + * remove cxn from $meta->{group_by} if there's only one connection displayed + * fix for issue 19 - cxn column won't become visible when viewing two + connections after having viewed one connection + * supress errors resulting from the addition of a 'BACKGROUND THREAD' + section in the output of 'show innodb status' + * possible fix for issue 22 - Useless use of a constant in void context + * small change to set_to_tbl() around hiding the cxn column if there + aren't two or more connections + 2009-03-09: version 1.7.1 Changes: * Don't display the CXN column if only one connection is active in the current view + * the 'state' column is now visible by default in Query List mode Bugs fixed: * fixed bug where trying to aggregate the time column would result diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 9179a0d7a81..f65c55cf0cf 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -1,8 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # vim: tw=160:nowrap:expandtab:tabstop=3:shiftwidth=3:softtabstop=3 # This program is copyright (c) 2006 Baron Schwartz, baron at xaprb dot com. +# Maintainers since 2013 : Kenny Gryp - Frédéric Descamps # Feedback and improvements are gratefully received. # # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED @@ -15,13 +16,13 @@ # systems, you can issue `man perlgpl' or `man perlartistic' to read these # You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA +# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +# Street, Fifth Floor, Boston, MA 02111-1301 USA use strict; use warnings FATAL => 'all'; -our $VERSION = '1.7.1'; +our $VERSION = '1.11.4'; # Find the home directory; it's different on different OSes. our $homepath = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; @@ -41,7 +42,7 @@ $Data::Dumper::Indent = 0; $Data::Dumper::Quotekeys = 0; use English qw(-no_match_vars); -use constant MKDEBUG => $ENV{MKDEBUG}; +use constant MKDEBUG => $ENV{MKDEBUG} || 0; # Defaults are built-in, but you can add/replace items by passing them as # hashrefs of {key, desc, copy, dsn}. The desc and dsn items are optional. @@ -93,7 +94,9 @@ sub new { }, }; foreach my $opt ( @opts ) { - MKDEBUG && _d('Adding extra property ' . $opt->{key}); + if (MKDEBUG) { + _d('Adding extra property ' . $opt->{key}); + } $self->{opts}->{$opt->{key}} = { desc => $opt->{desc}, copy => $opt->{copy} }; } return bless $self, $class; @@ -356,17 +359,18 @@ use Data::Dumper; $Data::Dumper::Sortkeys = 1; use English qw(-no_match_vars); use List::Util qw(max); +use POSIX qw(strftime); # Some common patterns my $d = qr/(\d+)/; # Digit my $f = qr/(\d+\.\d+)/; # Float -my $t = qr/(\d+ \d+)/; # Transaction ID +my $t = qr/((?:\d+ \d+)|(?:[A-Fa-f0-9]+))/; # Transaction ID my $i = qr/((?:\d{1,3}\.){3}\d+)/; # IP address my $n = qr/([^`\s]+)/; # MySQL object name my $w = qr/(\w+)/; # Words my $fl = qr/([\w\.\/]+) line $d/; # Filename and line number my $h = qr/((?:0x)?[0-9a-f]*)/; # Hex -my $s = qr/(\d{6} .\d:\d\d:\d\d)/; # InnoDB timestamp +my $s = qr/(\d{6} .?\d:\d\d:\d\d)/; # InnoDB timestamp # If you update this variable, also update the SYNOPSIS in the pod. my %innodb_section_headers = ( @@ -379,6 +383,7 @@ my %innodb_section_headers = ( "FILE I/O" => "io", "LATEST DETECTED DEADLOCK" => "dl", "LATEST FOREIGN KEY ERROR" => "fk", + "BACKGROUND THREAD" => "bt", ); my %parser_for = ( @@ -442,7 +447,7 @@ sub new { # to parse (hashref; if empty, parse all), and whether to parse full info from # locks and such (probably shouldn't unless you need to). sub parse_status_text { - my ( $self, $fulltext, $debug, $sections, $full ) = @_; + my ( $self, $fulltext, $debug, $sections, $full, $mysqlversion ) = @_; die "I can't parse undef" unless defined $fulltext; $fulltext =~ s/[\r\n]+/\n/g; @@ -464,8 +469,16 @@ sub parse_status_text { # Get the most basic info about the status: beginning and end, and whether # I got the whole thing (if there has been a big deadlock and there are # too many locks to print, the output might be truncated) - my ( $time_text ) = $fulltext =~ m/^$s INNODB MONITOR OUTPUT$/m; - $innodb_data{'ts'} = [ parse_innodb_timestamp( $time_text ) ]; + + my $time_text; + if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) { + ( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m; + $innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ]; + } else { + ( $time_text ) = $fulltext =~ m/^$s INNODB MONITOR OUTPUT$/m; + $innodb_data{'ts'} = [ parse_innodb_timestamp( $time_text ) ]; + } + $innodb_data{'timestring'} = ts_to_string($innodb_data{'ts'}); ( $innodb_data{'last_secs'} ) = $fulltext =~ m/Per second averages calculated from the last $d seconds/; @@ -483,22 +496,34 @@ sub parse_status_text { while ( my ( $start, $name, $text, $end ) = splice(@matches, 0, 4) ) { $innodb_sections{$name} = [ $text, $end ? 1 : 0 ]; } - # The Row Operations section is a special case, because instead of ending - # with the beginning of another section, it ends with the end of the file. - # So this section is complete if the entire file is complete. - $innodb_sections{'ROW OPERATIONS'}->[1] ||= $innodb_data{'got_all'}; # Just for sanity's sake, make sure I understand what to do with each - # section + # section. eval { foreach my $section ( keys %innodb_sections ) { my $header = $innodb_section_headers{$section}; - die "Unknown section $section in $fulltext\n" - unless $header; - $innodb_data{'sections'}->{ $header } - ->{'fulltext'} = $innodb_sections{$section}->[0]; - $innodb_data{'sections'}->{ $header } - ->{'complete'} = $innodb_sections{$section}->[1]; + if ( !$header && $debug ) { + warn "Unknown section $section in $fulltext\n"; + } + + # The last section in the file is a special case, because instead of + # ending with the beginning of another section, it ends with the end of + # the file. So this section is complete if the entire file is + # complete. In different versions of InnoDB, various sections are + # last. + if ( $innodb_sections{$section}->[0] =~ s/\n---+\nEND OF INNODB.+\n=+$// ) { + $innodb_sections{$section}->[1] ||= $innodb_data{'got_all'}; + } + + if ( $header && $section ) { + $innodb_data{'sections'}->{ $header } + ->{'fulltext'} = $innodb_sections{$section}->[0]; + $innodb_data{'sections'}->{ $header } + ->{'complete'} = $innodb_sections{$section}->[1]; + } + else { + _debug( $debug, "header = " . ($header || 'undef') . ", section = " . ($section || 'undef')) if $debug; + } } }; if ( $EVAL_ERROR ) { @@ -516,7 +541,8 @@ sub parse_status_text { $innodb_data{'sections'}->{$section}, $innodb_data{'sections'}->{$section}->{'complete'}, $debug, - $full ) + $full, + $mysqlversion) or delete $innodb_data{'sections'}->{$section}; } else { @@ -533,11 +559,11 @@ sub parse_status_text { # Parses the status text and returns it flattened out as a single hash. sub get_status_hash { - my ( $self, $fulltext, $debug, $sections, $full ) = @_; + my ( $self, $fulltext, $debug, $sections, $full, $mysqlversion ) = @_; # Parse the status text... my $innodb_status - = $self->parse_status_text($fulltext, $debug, $sections, $full ); + = $self->parse_status_text($fulltext, $debug, $sections, $full, $mysqlversion ); # Flatten the hierarchical structure into a single list by grabbing desired # sections from it. @@ -598,14 +624,29 @@ sub parse_innodb_timestamp { return ( $y, $m, $d, $h, $i, $s ); } +sub parse_innodb_timestamp_56 { + my $text = shift; + my ( $y, $m, $d, $h, $i, $s ) + = $text =~ m/^(\d\d\d\d)-(\d\d)-(\d\d) +(\d+):(\d+):(\d+)$/; + die("Can't get timestamp from $text\n") unless $y; + return ( $y, $m, $d, $h, $i, $s ); +} + sub parse_fk_section { - my ( $section, $complete, $debug, $full ) = @_; + my ( $section, $complete, $debug, $full, $mysqlversion ) = @_; my $fulltext = $section->{'fulltext'}; return 0 unless $fulltext; - my ( $ts, $type ) = $fulltext =~ m/^$s\s+(\w+)/m; - $section->{'ts'} = [ parse_innodb_timestamp( $ts ) ]; + my ( $ts, $type ); + if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[012]\./) ) { + ( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m; + $section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ]; + } else { + ( $ts, $type ) = $fulltext =~ m/^$s\s+(\w+)/m; + $section->{'ts'} = [ parse_innodb_timestamp( $ts ) ]; + } + $section->{'timestring'} = ts_to_string($section->{'ts'}); $section->{'type'} = $type; @@ -629,6 +670,9 @@ sub parse_fk_cant_drop_parent_error { =~ m{because it is referenced by `(.*)/(.*)`}m; ( $section->{'reason'} ) = $fulltext =~ m/(Cannot .*)/s; + if ( !defined $section->{reason} ) { + ( $section->{'reason'} ) = $fulltext =~ m/(Trying to add .*)/s; + } $section->{'reason'} =~ s/\n(?:InnoDB: )?/ /gm if $section->{'reason'}; @@ -699,7 +743,7 @@ sub parse_fk_transaction_error { # no matching parent record (row_ins_foreign_report_add_err). @{$section}{ qw(reason child_db child_table) } - = $fulltext =~ m{^(Foreign key constraint fails for table `(.*)/(.*)`:)$}m; + = $fulltext =~ m{^(Foreign key constraint fails for table `(.*?)`?[/.]`?(.*)`:)$}m; @{$section}{ qw(fk_name col_name parent_db parent_table parent_col) } = $fulltext @@ -847,7 +891,7 @@ sub parse_field { } sub parse_dl_section { - my ( $dl, $complete, $debug, $full ) = @_; + my ( $dl, $complete, $debug, $full, $mysqlversion ) = @_; return unless $dl; my $fulltext = $dl->{'fulltext'}; return 0 unless $fulltext; @@ -855,7 +899,12 @@ sub parse_dl_section { my ( $ts ) = $fulltext =~ m/^$s$/m; return 0 unless $ts; - $dl->{'ts'} = [ parse_innodb_timestamp( $ts ) ]; + if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) { + $dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ]; + } + else { + $dl->{'ts'} = [ parse_innodb_timestamp( $ts ) ]; + } $dl->{'timestring'} = ts_to_string($dl->{'ts'}); $dl->{'txns'} = {}; @@ -923,12 +972,22 @@ sub parse_innodb_record_locks { sub parse_tx_text { my ( $txn, $complete, $debug, $full ) = @_; - my ( $txn_id, $txn_status, $active_secs, $proc_no, $os_thread_id ) + my ( $txn_id, $txn_status ) + = $txn + =~ m/^(?:---)?TRANSACTION $t, ([^\n0-9,]*[^\s\d])/m; + $txn_status =~ s/,$// if $txn_status; + my ( $active_secs) + = $txn + =~ m/^[^\n]*\b$d sec\b/m; + my ( $proc_no ) + = $txn + =~ m/process no $d/m; + my ( $os_thread_id ) = $txn - =~ m/^(?:---)?TRANSACTION $t, (\D*?)(?: $d sec)?, (?:process no $d, )?OS thread id $d/m; + =~ m/OS thread id $d/m; my ( $thread_status, $thread_decl_inside ) = $txn - =~ m/OS thread id \d+(?: ([^,]+?))?(?:, thread declared inside InnoDB $d)?$/m; + =~ m/(?:OS thread id \d+|\d sec)(?: ([^,]+?))?(?:, thread declared inside InnoDB $d)?$/m; # Parsing the line that begins 'MySQL thread id' is complicated. The only # thing always in the line is the thread and query id. See function @@ -938,7 +997,7 @@ sub parse_tx_text { if ( $thread_line ) { # These parts can always be gotten. - ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MySQL thread id $d, query id $d/m; + ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MySQL thread id $d, .*?query id $d/m; # If it's a master/slave thread, "Has (read|sent) all" may be the thread's # proc_info. In these cases, there won't be any host/ip/user info @@ -963,6 +1022,11 @@ sub parse_tx_text { # It's basically impossible to know which is which. ( $hostname, $user, $query_status ) = $thread_line =~ m/query id \d+(?: ([A-Za-z]\S+))?(?: $w(?: (.*))?)?$/m; + if ( ($hostname || '') eq 'Slave' ) { + $hostname = ''; + $user = 'system user'; + $query_status = "Slave has $query_status"; + } } else { $user = 'system user'; @@ -1064,7 +1128,7 @@ sub parse_tx_section { $section->{'transactions'} = []; # Handle the individual transactions - my @transactions = $fulltext =~ m/(---TRANSACTION \d.*?)(?=\n---TRANSACTION|$)/gs; + my @transactions = $fulltext =~ m/(---TRANSACTION [0-9A-Fa-f].*?)(?=\n---TRANSACTION|$)/gs; foreach my $txn ( @transactions ) { my $stuff = parse_tx_text( $txn, $complete, $debug, $full ); delete $stuff->{'fulltext'} unless $debug; @@ -1131,7 +1195,7 @@ sub parse_lg_section { ( $section->{ 'last_chkp' } ) = $fulltext =~ m/Last checkpoint at \s*(\d.*)$/m; @{$section}{ 'pending_log_writes', 'pending_chkp_writes' } - = $fulltext =~ m/$d pending log writes, $d pending chkp writes/; + = $fulltext =~ m/$d pending log (?:writes|flushes), $d pending chkp writes/; @{$section}{ 'log_ios_done', 'log_ios_s' } = $fulltext =~ m#$d log i/o's done, $f log i/o's/second#; @@ -1149,12 +1213,19 @@ sub parse_ib_section { # the source code shows there will only ever be one). I have to parse both # cases here, but I assume there will only be one. @{$section}{ 'size', 'free_list_len', 'seg_size' } - = $fulltext =~ m/^Ibuf(?: for space 0)?: size $d, free list len $d, seg size $d,$/m; + = $fulltext =~ m/^Ibuf(?: for space 0)?: size $d, free list len $d, seg size $d/m; @{$section}{ 'inserts', 'merged_recs', 'merges' } = $fulltext =~ m/^$d inserts, $d merged recs, $d merges$/m; + if ( ! defined $section->{inserts} ) { + @{$section}{ 'inserts' } + = $fulltext =~ m/merged operations:\n insert $d,/s; + # This isn't really true, but it's not really important either. We already + # aren't supporting the 'delete' operations. + @{$section}{ 'merged_recs', 'merges' } = (0, 0); + } @{$section}{ 'hash_table_size', 'used_cells', 'bufs_in_node_heap' } - = $fulltext =~ m/^Hash table size $d, used cells $d, node heap has $d buffer\(s\)$/m; + = $fulltext =~ m/^Hash table size $d(?:, used cells $d)?, node heap has $d buffer\(s\)$/m; @{$section}{ 'hash_searches_s', 'non_hash_searches_s' } = $fulltext =~ m{^$f hash searches/s, $f non-hash searches/s$}m; @@ -1215,6 +1286,12 @@ sub parse_sm_section { = $fulltext =~ m/^Mutex spin waits $d, rounds $d, OS waits $d$/m; @{$section}{ 'rw_shared_spins', 'rw_shared_os_waits', 'rw_excl_spins', 'rw_excl_os_waits' } = $fulltext =~ m/^RW-shared spins $d, OS waits $d; RW-excl spins $d, OS waits $d$/m; + if ( ! defined $section->{rw_shared_spins} ) { + @{$section}{ 'rw_shared_spins', 'rw_shared_os_waits'} + = $fulltext =~ m/^RW-shared spins $d, rounds \d+, OS waits $d$/m; + @{$section}{ 'rw_excl_spins', 'rw_excl_os_waits' } + = $fulltext =~ m/^RW-excl spins $d, rounds \d+, OS waits $d$/m; + } # Look for info on waits. my @waits = $fulltext =~ m/^(--Thread.*?)^(?=Mutex spin|--Thread)/gms; @@ -1245,14 +1322,14 @@ sub parse_bp_section { @{$section}{'page_reads_sec', 'page_creates_sec', 'page_writes_sec'} = $fulltext =~ m{^$f reads/s, $f creates/s, $f writes/s$}m; @{$section}{'buf_pool_hits', 'buf_pool_reads'} - = $fulltext =~ m{Buffer pool hit rate $d / $d$}m; + = $fulltext =~ m{Buffer pool hit rate $d / $d}m; if ($fulltext =~ m/^No buffer pool page gets since the last printout$/m) { @{$section}{'buf_pool_hits', 'buf_pool_reads'} = (0, 0); @{$section}{'buf_pool_hit_rate'} = '--'; } else { @{$section}{'buf_pool_hit_rate'} - = $fulltext =~ m{Buffer pool hit rate (\d+ / \d+)$}m; + = $fulltext =~ m{Buffer pool hit rate (\d+ / \d+)}m; } @{$section}{'reads_pending'} = $fulltext =~ m/^Pending reads $d/m; @{$section}{'writes_pending_lru', 'writes_pending_flush_list', 'writes_pending_single_page' } @@ -1292,7 +1369,7 @@ sub parse_io_section { # Grab the reads/writes/flushes info @{$section}{ 'pending_normal_aio_reads', 'pending_aio_writes' } - = $fulltext =~ m/^Pending normal aio reads: $d, aio writes: $d,$/m; + = $fulltext =~ m/^Pending normal aio reads: $d(?: [^\]]*\])?, aio writes: $d/m; @{$section}{ 'pending_ibuf_aio_reads', 'pending_log_ios', 'pending_sync_ios' } = $fulltext =~ m{^ ibuf aio reads: $d, log i/o's: $d, sync i/o's: $d$}m; @{$section}{ 'flush_type', 'pending_log_flushes', 'pending_buffer_pool_flushes' } @@ -1361,8 +1438,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, MA 02111-1301 USA. LICENSE # Configuration information and global setup {{{1 @@ -1393,6 +1470,7 @@ my %col_props = ( trans => [], agg => 'first', # Aggregate function aggonly => 0, # Whether to show only when tbl_meta->{aggregate} is true + agghide => 0, # Whether NOT to show when tbl_meta->{aggregate} is true ); # Actual DBI connections to MySQL servers. @@ -1410,13 +1488,17 @@ my @opt_spec = ( { s => 'delay|d=f', d => 'Delay between updates in seconds', c => 'interval' }, { s => 'mode|m=s', d => 'Operating mode to start in', c => 'mode' }, { s => 'inc|i!', d => 'Measure incremental differences', c => 'status_inc' }, + { s => 'spark=i', d => 'Length of status sparkline (default 10)', c=> 'spark' }, { s => 'write|w', d => 'Write running configuration into home directory if no config files were loaded' }, { s => 'skipcentral|s', d => 'Skip reading the central configuration file' }, { s => 'version', d => 'Output version information and exit' }, { s => 'user|u=s', d => 'User for login if not current user' }, { s => 'password|p=s', d => 'Password to use for connection' }, + { s => 'askpass', d => 'Prompt for a password when connecting to MySQL'}, { s => 'host|h=s', d => 'Connect to host' }, { s => 'port|P=i', d => 'Port number to use for connection' }, + { s => 'socket|S=s', d => 'MySQL socket to use for connection' }, + { s => 'timestamp|t+', d => 'Print timestamp in -n mode (1: per iter; 2: per line)' }, ); # This is the container for the command-line options' values to be stored in @@ -1427,7 +1509,7 @@ my %opts = ( # Post-process... my %opt_seen; foreach my $spec ( @opt_spec ) { - my ( $long, $short ) = $spec->{s} =~ m/^(\w+)(?:\|([^!+=]*))?/; + my ( $long, $short ) = $spec->{s} =~ m/^(\w+)(?:\|([^!+=:]*))?/; $spec->{k} = $short || $long; $spec->{l} = $long; $spec->{t} = $short; @@ -1448,6 +1530,11 @@ if ( $opts{c} and ! -f $opts{c} ) { print $opts{c} . " doesn't exist. Exiting.\n"; exit(1); } + +if ( $opts{'askpass'} ) { + $opts{'p'} = noecho_password("Enter password "); +} + if ( $opts{'help'} ) { print "Usage: innotop <options> <innodb-status-file>\n\n"; my $maxw = max(map { length($_->{l}) + ($_->{n} ? 4 : 0)} @opt_spec); @@ -1468,6 +1555,14 @@ USAGE exit(1); } +if ( defined($opts{p}) && length($opts{p}) == 0 ) { + print "Enter password: "; + ReadMode('noecho'); + $opts{p} = <STDIN>; + chomp($opts{p}); + ReadMode('normal'); +} + # Meta-data (table definitions etc) {{{2 # ########################################################################### @@ -1475,7 +1570,7 @@ USAGE # Convenience so I can copy/paste these in several places... # ########################################################################### my %exprs = ( - Host => q{my $host = host || hostname || ''; ($host) = $host =~ m/^((?:[\d.]+(?=:))|(?:[a-zA-Z]\w+))/; return $host || ''}, + Host => q{my $host = host || hostname || ''; ($host) = $host =~ m/^((?:[\d.]+(?=:|$))|(?:[a-z0-9-]+))/i; return $host || ''}, Port => q{my ($p) = host =~ m/:(.*)$/; return $p || 0}, OldVersions => q{dulint_to_int(IB_tx_trx_id_counter) - dulint_to_int(IB_tx_purge_done_for)}, MaxTxnTime => q/max(map{ $_->{active_secs} } @{ IB_tx_transactions }) || 0/, @@ -1483,9 +1578,18 @@ my %exprs = ( DirtyBufs => q{ $cur->{IB_bp_pages_modified} / ($cur->{IB_bp_buf_pool_size} || 1) }, BufPoolFill => q{ $cur->{IB_bp_pages_total} / ($cur->{IB_bp_buf_pool_size} || 1) }, ServerLoad => q{ $cur->{Threads_connected}/(Questions||1)/Uptime_hires }, + Connection => q{ max_connections || $cur->{Threads_connected} }, + chcxn_2_cxn => q{ if ( defined($cur->{cxn}) ) { return $cur->{cxn}; } else { my ($cha, $conn) = split ("=",$cur->{chcxn}) ; return $conn; } }, + chcxn_2_ch => q{ if ( defined($cur->{channel_name}) ) { return $cur->{channel_name}; } else { my ($cha, $conn) = split ("=",$cur->{chcxn}) ; $cha = '' if ($cha = /no_channels/); return $cha || 'failed'; } }, TxnTimeRemain => q{ defined undo_log_entries && defined $pre->{undo_log_entries} && undo_log_entries < $pre->{undo_log_entries} ? undo_log_entries / (($pre->{undo_log_entries} - undo_log_entries)/((active_secs-$pre->{active_secs})||1))||1 : 0}, SlaveCatchupRate => ' defined $cur->{seconds_behind_master} && defined $pre->{seconds_behind_master} && $cur->{seconds_behind_master} < $pre->{seconds_behind_master} ? ($pre->{seconds_behind_master}-$cur->{seconds_behind_master})/($cur->{Uptime_hires}-$pre->{Uptime_hires}) : 0', QcacheHitRatio => q{(Qcache_hits||0)/(((Com_select||0)+(Qcache_hits||0))||1)}, + QueryDetail => q{sprintf("%2d/%2d/%2d/%2d", + ((Com_select||0)+(Qcache_hits||0))/(Questions||1)*100, + ((Com_insert||0)+(Com_replace||0))/(Questions||1)*100, + (Com_update||0)/(Questions||1)*100, + (Com_delete||0)/(Questions||1)*100, +)}, ); # ########################################################################### @@ -1503,12 +1607,21 @@ my %exprs = ( my %columns = ( active_secs => { hdr => 'SecsActive', num => 1, label => 'Seconds transaction has been active', }, - add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additional pool allocated' }, + add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additonal pool allocated' }, attempted_op => { hdr => 'Action', num => 0, label => 'The action that caused the error' }, awe_mem_alloc => { hdr => 'AWE Memory', num => 1, label => '[Windows] AWE memory allocated' }, binlog_cache_overflow => { hdr => 'Binlog Cache', num => 1, label => 'Transactions too big for binlog cache that went to disk' }, binlog_do_db => { hdr => 'Binlog Do DB', num => 0, label => 'binlog-do-db setting' }, binlog_ignore_db => { hdr => 'Binlog Ignore DB', num => 0, label => 'binlog-ignore-db setting' }, + blocking_thread => { hdr => 'BThread', num => 1, label => 'Blocking thread' }, + blocking_query => { hdr => 'Blocking Query', num => 0, label => 'Blocking query' }, + blocking_rows_modified => { hdr => 'BRowsMod', num => 1, label => 'Blocking number rows modified' }, + blocking_age => { hdr => 'BAge', num => 1, label => 'Blocking age' }, + blocking_wait_secs => { hdr => 'BWait', num => 1, label => 'Blocking wait time' }, + blocking_user => { hdr => 'BUser', num => 0, label => 'Blocking user' }, + blocking_host => { hdr => 'BHost', num => 0, label => 'Blocking host' }, + blocking_db => { hdr => 'BDB', num => 0, label => 'Blocking database' }, + blocking_status => { hdr => 'BStatus', num => 0, label => 'Blocking thread status' }, bps_in => { hdr => 'BpsIn', num => 1, label => 'Bytes per second received by the server', }, bps_out => { hdr => 'BpsOut', num => 1, label => 'Bytes per second sent by the server', }, buf_free => { hdr => 'Free Bufs', num => 1, label => 'Buffers free in the buffer pool' }, @@ -1520,11 +1633,13 @@ my %columns = ( bytes_behind_master => { hdr => 'ByteLag', num => 1, label => 'Bytes the slave lags the master in binlog' }, cell_event_set => { hdr => 'Ending?', num => 1, label => 'Whether the cell event is set' }, cell_waiting => { hdr => 'Waiting?', num => 1, label => 'Whether the cell is waiting' }, + channel_name => { hdr => 'Channel', num => 0, label => 'The name of the replication channel' }, child_db => { hdr => 'Child DB', num => 0, label => 'The database of the child table' }, child_index => { hdr => 'Child Index', num => 0, label => 'The index in the child table' }, child_table => { hdr => 'Child Table', num => 0, label => 'The child table' }, cmd => { hdr => 'Cmd', num => 0, label => 'Type of command being executed', }, cnt => { hdr => 'Cnt', num => 0, label => 'Count', agg => 'count', aggonly => 1 }, + connections => { hdr => 'Cxns', num => 1, label => 'Connections' }, connect_retry => { hdr => 'Connect Retry', num => 1, label => 'Slave connect-retry timeout' }, cxn => { hdr => 'CXN', num => 0, label => 'Connection from which the data came', }, db => { hdr => 'DB', num => 0, label => 'Current database', }, @@ -1533,6 +1648,7 @@ my %columns = ( dl_txn_num => { hdr => 'Num', num => 0, label => 'Deadlocked transaction number', }, event_set => { hdr => 'Evt Set?', num => 1, label => '[Win32] if a wait event is set', }, exec_master_log_pos => { hdr => 'Exec Master Log Pos', num => 1, label => 'Exec Master Log Position' }, + executed_gtid_set => { hdr => 'Executed GTID Set', num => 0, label => 'Executed GTID Set', }, fk_name => { hdr => 'Constraint', num => 0, label => 'The name of the FK constraint' }, free_list_len => { hdr => 'Free List Len', num => 1, label => 'Length of the free list' }, has_read_view => { hdr => 'Rd View', num => 1, label => 'Whether the transaction has a read view' }, @@ -1544,7 +1660,7 @@ my %columns = ( host_and_domain => { hdr => 'Host', num => 0, label => 'Hostname/IP and domain' }, host_and_port => { hdr => 'Host/IP', num => 0, label => 'Hostname or IP address, and port number', }, hostname => { hdr => 'Host', num => 0, label => 'Hostname' }, - index => { hdr => 'Index', num => 0, label => 'The index involved' }, + index => { hdr => 'Index', num => 0, label => 'The index involved', agghide => 1 }, index_ref => { hdr => 'Index Ref', num => 0, label => 'Index referenced' }, info => { hdr => 'Query', num => 0, label => 'Info or the current query', }, insert_intention => { hdr => 'Ins Intent', num => 1, label => 'Whether the thread was trying to insert' }, @@ -1569,8 +1685,10 @@ my %columns = ( last_total => { hdr => 'Last Total', num => 1, label => 'Last Total' }, last_value => { hdr => 'Last Incr', num => 1, label => 'Last Value' }, load => { hdr => 'Load', num => 1, label => 'Server load' }, + locked_count => { hdr => 'Lock', num => 1, label => 'Number of locked threads' }, lock_cfile_name => { hdr => 'Crtd File', num => 0, label => 'Filename where lock created' }, lock_cline => { hdr => 'Crtd Line', num => 1, label => 'Line where lock created' }, + lock_info => { hdr => 'Lock Info', num => 0, label => 'Lock information' }, lock_mem_addr => { hdr => 'Addr', num => 0, label => 'The lock memory address' }, lock_mode => { hdr => 'Mode', num => 0, label => 'The lock mode' }, lock_structs => { hdr => 'LStrcts', num => 1, label => 'Number of lock structs' }, @@ -1581,6 +1699,7 @@ my %columns = ( log_ios_done => { hdr => 'IO Done', num => 1, label => 'Log I/Os done' }, log_ios_s => { hdr => 'IO/Sec', num => 1, label => 'Average log I/Os per sec' }, log_seq_no => { hdr => 'Sequence No.', num => 0, label => 'Log sequence number' }, + longest_sql => { hdr => 'SQL', num => 0, label => 'Longest-running SQL statement' }, main_thread_id => { hdr => 'Main Thread ID', num => 1, label => 'Main thread ID' }, main_thread_proc_no => { hdr => 'Main Thread Proc', num => 1, label => 'Main thread process number' }, main_thread_state => { hdr => 'Main Thread State', num => 0, label => 'Main thread state' }, @@ -1596,9 +1715,12 @@ my %columns = ( master_ssl_cipher => { hdr => 'Master SSL Cipher', num => 0, label => 'Master SSL Cipher' }, master_ssl_key => { hdr => 'Master SSL Key', num => 0, label => 'Master SSL Key' }, master_user => { hdr => 'Master User', num => 0, label => 'Master username' }, + master_uuid => { hdr => 'Master UUID', num => 0, label => 'Master UUID', }, max_txn => { hdr => 'MaxTxnTime', num => 1, label => 'MaxTxn' }, + max_query_time => { hdr => 'MaxSQL', num => 1, label => 'Longest running SQL' }, merged_recs => { hdr => 'Merged Recs', num => 1, label => 'Merged records' }, merges => { hdr => 'Merges', num => 1, label => 'Merges' }, + miss_rate => { hdr => 'Miss', num => 1, label => 'InnoDB buffer pool miss rate' }, mutex_os_waits => { hdr => 'Waits', num => 1, label => 'Mutex OS Waits' }, mutex_spin_rounds => { hdr => 'Rounds', num => 1, label => 'Mutex Spin Rounds' }, mutex_spin_waits => { hdr => 'Spins', num => 1, label => 'Mutex Spin Waits' }, @@ -1619,6 +1741,7 @@ my %columns = ( num_txns => { hdr => 'Txns', num => 1, label => 'Number of transactions' }, num_updates => { hdr => 'Upd', num => 1, label => 'Number of updates' }, num_updates_sec => { hdr => 'Upd/Sec', num => 1, label => 'Number of updates' }, + 'open' => { hdr => 'Tbls', num => 1, label => 'Number of open tables' }, os_file_reads => { hdr => 'OS Reads', num => 1, label => 'OS file reads' }, os_file_writes => { hdr => 'OS Writes', num => 1, label => 'OS file writes' }, os_fsyncs => { hdr => 'OS fsyncs', num => 1, label => 'OS fsyncs' }, @@ -1653,6 +1776,7 @@ my %columns = ( port => { hdr => 'Port', num => 1, label => 'Client port number', }, possible_keys => { hdr => 'Poss. Keys', num => 0, label => 'Possible keys' }, proc_no => { hdr => 'Proc', num => 1, label => 'Process number' }, + q_detail => { hdr => 'Se/In/Up/De%', num => 0, label => 'Detailed Query', }, q_cache_hit => { hdr => 'QCacheHit', num => 1, label => 'Query cache hit ratio', }, qps => { hdr => 'QPS', num => 1, label => 'How many queries/sec', }, queries_in_queue => { hdr => 'Queries Queued', num => 1, label => 'Queries in queue' }, @@ -1676,14 +1800,23 @@ my %columns = ( replicate_wild_ignore_table => { hdr => 'Wild Ignore Table', num => 0, label => 'Replicate-wild-ignore-table setting' }, request_type => { hdr => 'Type', num => 0, label => 'Type of lock the thread waits for' }, reservation_count => { hdr => 'ResCnt', num => 1, label => 'Reservation Count' }, + retrieved_gtid_set => { hdr => 'Retrieved GTID Set', num => 0, label => 'Retrieved GTID Set', }, row_locks => { hdr => 'RLocks', num => 1, label => 'Number of row locks' }, + rows_changed => { hdr => 'Changed', num => 1, label => 'Number of rows changed' }, + rows_changed_x_indexes => { hdr => 'Chg X Idx', num => 1, label => 'Number of rows changed X indexes' }, + rows_read => { hdr => 'Reads', num => 1, label => 'Number of rows read' }, + rows_read_from_indexes => { hdr => 'Reads Via Idx', num => 1, label => 'Number of rows read from indexes' }, + run => { hdr => 'Run', num => 1, label => 'Threads_running' }, rw_excl_os_waits => { hdr => 'RW Waits', num => 1, label => 'R/W Excl. OS Waits' }, rw_excl_spins => { hdr => 'RW Spins', num => 1, label => 'R/W Excl. Spins' }, rw_shared_os_waits => { hdr => 'Sh Waits', num => 1, label => 'R/W Shared OS Waits' }, rw_shared_spins => { hdr => 'Sh Spins', num => 1, label => 'R/W Shared Spins' }, + spark_qps => { hdr => 'QPS', num => 0, label => 'QPS Sparkline' }, + spark_run => { hdr => 'Run', num => 0, label => 'Threads_running Sparkline' }, scan_type => { hdr => 'Type', num => 0, label => 'Scan type in chosen' }, seg_size => { hdr => 'Seg. Size', num => 1, label => 'Segment size' }, select_type => { hdr => 'Select Type', num => 0, label => 'Type of select used' }, + server_uuid => { hdr => 'Server UUID', num => 0, label => 'Server UUID', }, signal_count => { hdr => 'Signals', num => 1, label => 'Signal Count' }, size => { hdr => 'Size', num => 1, label => 'Size of the tablespace' }, skip_counter => { hdr => 'Skip Counter', num => 1, label => 'Skip counter' }, @@ -1691,7 +1824,9 @@ my %columns = ( slave_io_running => { hdr => 'Slave-IO', num => 0, label => 'Whether the slave I/O thread is running' }, slave_io_state => { hdr => 'Slave IO State', num => 0, label => 'Slave I/O thread state' }, slave_open_temp_tables => { hdr => 'Temp', num => 1, label => 'Slave open temp tables' }, + slave_running => { hdr => 'Repl', num => 0, label => 'Slave running' }, slave_sql_running => { hdr => 'Slave-SQL', num => 0, label => 'Whether the slave SQL thread is running' }, + sort_time => { hdr => 'SortTimeLag', num => 1, label => 'Time slave lags master sort' }, slow => { hdr => 'Slow', num => 1, label => 'How many slow queries', }, space_id => { hdr => 'Space', num => 1, label => 'Tablespace ID' }, special => { hdr => 'Special', num => 0, label => 'Special/Other info' }, @@ -1718,6 +1853,7 @@ my %columns = ( undo_for => { hdr => 'Undo', num => 0, label => 'Undo for' }, until_condition => { hdr => 'Until Condition', num => 0, label => 'Slave until condition' }, until_log_file => { hdr => 'Until Log File', num => 0, label => 'Slave until log file' }, + uptime => { hdr => 'Uptime', num => 1, label => 'Uptime' }, until_log_pos => { hdr => 'Until Log Pos', num => 1, label => 'Slave until log position' }, used_cells => { hdr => 'Cells Used', num => 1, label => 'Number of cells used' }, used_bufs => { hdr => 'Used Bufs', num => 1, label => 'Number of buffer pool pages used' }, @@ -1731,6 +1867,14 @@ my %columns = ( waited_at_line => { hdr => 'Line', num => 1, label => 'Line at which thread waits' }, waiters_flag => { hdr => 'Waiters', num => 1, label => 'Waiters Flag' }, waiting => { hdr => 'Waiting', num => 1, label => 'Whether lock is being waited for' }, + waiting_thread => { hdr => 'WThread', num => 1, label => 'Waiting thread' }, + waiting_query => { hdr => 'Waiting Query', num => 0, label => 'Waiting query' }, + waiting_rows_modified => { hdr => 'WRowsMod', num => 1, label => 'Waiting number rows modified' }, + waiting_age => { hdr => 'WAge', num => 1, label => 'Waiting age' }, + waiting_wait_secs => { hdr => 'WWait', num => 1, label => 'Waiting wait time' }, + waiting_user => { hdr => 'WUser', num => 0, label => 'Waiting user' }, + waiting_host => { hdr => 'WHost', num => 0, label => 'Waiting host' }, + waiting_db => { hdr => 'WDB', num => 0, label => 'Waiting database' }, when => { hdr => 'When', num => 0, label => 'Time scale' }, writer_lock_mode => { hdr => 'Wrtr Lck Mode', num => 0, label => 'Writer lock mode' }, writer_thread => { hdr => 'Wrtr Thread', num => 1, label => 'Writer thread ID' }, @@ -1763,8 +1907,7 @@ my %filters = (); my %builtin_filters = ( hide_self => { text => <<' END', - return ( !$set->{info} || $set->{info} ne 'SHOW FULL PROCESSLIST' ) - && ( !$set->{query_text} || $set->{query_text} !~ m/INNODB STATUS$/ ); + return ( ($set->{info} || '') !~ m#/\*innotop\*/# ); END note => 'Removes the innotop processes from the list', tbls => [qw(innodb_transactions processlist)], @@ -1773,18 +1916,33 @@ my %builtin_filters = ( text => <<' END', return ( !defined($set->{txn_status}) || $set->{txn_status} ne 'not started' ) && ( !defined($set->{cmd}) || $set->{cmd} !~ m/Sleep|Binlog Dump/ ) + && ( !defined($set->{state}) || $set->{state} !~ m/^handlersocket/ ) && ( !defined($set->{info}) || $set->{info} =~ m/\S/ ); END note => 'Removes processes which are not doing anything', tbls => [qw(innodb_transactions processlist)], }, + hide_connect => { + text => <<' END', + return ( !defined($set->{cmd}) || $set->{cmd} !~ m/Connect/ ); + END + note => 'Removes the slave processes from the list', + tbls => [qw(processlist)], + }, hide_slave_io => { text => <<' END', - return !$set->{state} || $set->{state} !~ m/^(?:Waiting for master|Has read all relay)/; + return !$set->{state} || $set->{state} !~ m/^(?:Waiting for master|read all relay)/; END note => 'Removes slave I/O threads from the list', tbls => [qw(processlist slave_io_status)], }, + hide_event => { + text => <<' END', + return (($set->{state} || '') !~ m/^Daemon/) || (($set->{info} || '') !~ m/\S/); + END + note => 'Removes idle event threads from the list', + tbls => [qw(processlist)], + }, table_is_open => { text => <<' END', return $set->{num_times_open} + $set->{is_name_locked}; @@ -2038,11 +2196,13 @@ my %agg_funcs = ( my %trans_funcs = ( shorten => \&shorten, secs_to_time => \&secs_to_time, + distill => \&distill, no_ctrl_char => \&no_ctrl_char, percent => \&percent, commify => \&commify, dulint_to_int => \&dulint_to_int, set_precision => \&set_precision, + fuzzy_time => \&fuzzy_time, ); # Table definitions {{{3 @@ -2123,6 +2283,7 @@ my %tbl_meta = ( capt => 'Command Summary', cust => {}, cols => { + cxn => { src => 'cxn' }, name => { src => 'name' }, total => { src => 'total' }, value => { src => 'value', agg => 'sum'}, @@ -2131,7 +2292,7 @@ my %tbl_meta = ( last_value => { src => 'last_value', agg => 'sum'}, last_pct => { src => 'last_value/last_total', trans => [qw(percent)] }, }, - visible => [qw(name value pct last_value last_pct)], + visible => [qw(cxn name value pct last_value last_pct)], filters => [qw()], sort_cols => '-value', sort_dir => '1', @@ -2281,6 +2442,49 @@ my %tbl_meta = ( group_by => [], aggregate => 0, }, + index_statistics => { + capt => 'Data from INDEX_STATISTICS', + cust => {}, + cols => { + cxn => { src => 'cxn', minw => 6, maxw => 10 }, + db => { src => 'table_schema' }, + tbl => { src => 'table_name' }, + index => { src => 'index_name' }, + rows_read => { src => 'rows_read', agg => 'sum' }, + }, + visible => [ qw(cxn db tbl index rows_read) ], + filters => [ ], + sort_cols => 'rows_read', + sort_dir => '-1', + innodb => '', + colors => [], + hide_caption => 1, + group_by => [qw(cxn db tbl)], + aggregate => 0, + }, + index_table_statistics => { + capt => 'Data from {TABLE,INDEX}_STATISTICS', + cust => {}, + cols => { + cxn => { src => 'cxn', minw => 6, maxw => 10 }, + db => { src => 'table_schema' }, + tbl => { src => 'table_name' }, + index => { src => 'index_name' }, + rows_read => { src => 'rows_read' }, + rows_read_from_indexes => { src => 'rows_read_from_indexes' }, + rows_changed => { src => 'rows_changed' }, + rows_changed_x_indexes => { src => 'rows_changed_x_indexes' }, + }, + visible => [ qw(cxn db tbl rows_read rows_read_from_indexes rows_changed rows_changed_x_indexes) ], + filters => [ ], + sort_cols => 'rows_read', + sort_dir => '-1', + innodb => '', + colors => [], + hide_caption => 1, + group_by => [qw(cxn db tbl)], + aggregate => 0, + }, insert_buffers => { capt => 'Insert Buffers', cust => {}, @@ -2301,6 +2505,43 @@ my %tbl_meta = ( group_by => [], aggregate => 0, }, + innodb_blocked_blocker => { + capt => 'InnoDB Blocked/Blocking', + cust => {}, + cols => { + cxn => { src => 'cxn' }, + waiting_thread => { src => 'waiting_thread' }, + waiting_query => { src => 'waiting_query', trans => [qw(distill)] }, + waiting_rows_modified => { src => 'waiting_rows_modified' }, + waiting_age => { src => 'waiting_age', trans => [qw(fuzzy_time)] }, + waiting_wait_secs => { src => 'waiting_wait_secs', trans => [qw(fuzzy_time)] }, + waiting_user => { src => 'waiting_user' }, + waiting_host => { src => 'waiting_host' }, + waiting_db => { src => 'waiting_db' }, + blocking_thread => { src => 'blocking_thread' }, + blocking_query => { src => 'blocking_query', trans => [qw(distill)] }, + blocking_rows_modified => { src => 'blocking_rows_modified' }, + blocking_age => { src => 'blocking_age', trans => [qw(fuzzy_time)] }, + blocking_wait_secs => { src => 'blocking_wait_secs', trans => [qw(fuzzy_time)] }, + blocking_user => { src => 'blocking_user' }, + blocking_host => { src => 'blocking_host' }, + blocking_db => { src => 'blocking_db' }, + blocking_status => { src => 'blocking_status' }, + lock_info => { src => 'lock_info' }, + }, + visible => [ qw(cxn waiting_thread waiting_query waiting_wait_secs + blocking_thread blocking_rows_modified blocking_age blocking_wait_secs + blocking_status blocking_query)], + filters => [], + sort_cols => 'cxn -waiting_wait_secs', + sort_dir => '1', + innodb => 'tx', + colors => [ + ], + group_by => [], + aggregate => 0, + hide_caption => 1, + }, innodb_locks => { capt => 'InnoDB Locks', cust => {}, @@ -2429,19 +2670,22 @@ my %tbl_meta = ( capt => 'Master Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, binlog_do_db => { src => 'binlog_do_db' }, binlog_ignore_db => { src => 'binlog_ignore_db' }, master_file => { src => 'file' }, master_pos => { src => 'position' }, binlog_cache_overflow => { src => '(Binlog_cache_disk_use||0)/(Binlog_cache_use||1)', trans => [ qw(percent) ] }, + executed_gtid_set => { src => '(executed_gtid_set||"N/A")' }, + server_uuid => { src => '(server_uuid||"N/A")' }, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, - visible => [ qw(cxn master_file master_pos binlog_cache_overflow)], + visible => [ qw(cxn channel_name master_file master_pos binlog_cache_overflow executed_gtid_set server_uuid)], filters => [ qw(cxn_is_master) ], sort_cols => 'cxn', sort_dir => '1', innodb => '', - group_by => [], + group_by => [qw(channel_name)], aggregate => 0, }, pending_io => { @@ -2512,7 +2756,7 @@ my %tbl_meta = ( cxn => { src => 'cxn', minw => 6, maxw => 10 }, mysql_thread_id => { src => 'id', minw => 6, maxw => 0 }, user => { src => 'user', minw => 5, maxw => 8 }, - hostname => { src => $exprs{Host}, minw => 13, maxw => 8, }, + hostname => { src => $exprs{Host}, minw => 7, maxw => 15, }, port => { src => $exprs{Port}, minw => 0, maxw => 0, }, host_and_port => { src => 'host', minw => 0, maxw => 0 }, db => { src => 'db', minw => 6, maxw => 12 }, @@ -2523,7 +2767,7 @@ my %tbl_meta = ( cnt => { src => 'id', minw => 0, maxw => 0 }, }, visible => [ qw(cxn cmd cnt mysql_thread_id state user hostname db time info)], - filters => [ qw(hide_self hide_inactive hide_slave_io) ], + filters => [ qw(hide_self hide_inactive hide_slave_io hide_event hide_connect) ], sort_cols => '-time cxn hostname mysql_thread_id', sort_dir => '1', innodb => '', @@ -2556,14 +2800,16 @@ my %tbl_meta = ( questions => { src => 'Questions' }, qps => { src => 'Questions/Uptime_hires', dec => 1, trans => [qw(shorten)] }, load => { src => $exprs{ServerLoad}, dec => 1, trans => [qw(shorten)] }, + connections => { src => $exprs{Connection}, dec => 1, trans => [qw(shorten)] }, slow => { src => 'Slow_queries', dec => 1, trans => [qw(shorten)] }, q_cache_hit => { src => $exprs{QcacheHitRatio}, dec => 1, trans => [qw(percent)] }, key_buffer_hit => { src => '1-(Key_reads/(Key_read_requests||1))', dec => 1, trans => [qw(percent)] }, bps_in => { src => 'Bytes_received/Uptime_hires', dec => 1, trans => [qw(shorten)] }, bps_out => { src => 'Bytes_sent/Uptime_hires', dec => 1, trans => [qw(shorten)] }, when => { src => 'when' }, + q_detail => { src => $exprs{QueryDetail} }, }, - visible => [ qw(cxn when load qps slow q_cache_hit key_buffer_hit bps_in bps_out)], + visible => [ qw(cxn when load connections qps slow q_detail q_cache_hit key_buffer_hit bps_in bps_out)], filters => [], sort_cols => 'when cxn', sort_dir => '1', @@ -2646,9 +2892,10 @@ my %tbl_meta = ( capt => 'Slave I/O Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, connect_retry => { src => 'connect_retry' }, master_host => { src => 'master_host', hdr => 'Master'}, + master_uuid => { src => '(master_uuid||"N/A")' }, master_log_file => { src => 'master_log_file', hdr => 'File' }, master_port => { src => 'master_port' }, master_ssl_allowed => { src => 'master_ssl_allowed' }, @@ -2662,27 +2909,29 @@ my %tbl_meta = ( relay_log_size => { src => 'relay_log_space', trans => [qw(shorten)] }, slave_io_running => { src => 'slave_io_running', hdr => 'On?' }, slave_io_state => { src => 'slave_io_state', hdr => 'State' }, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, - visible => [ qw(cxn master_host slave_io_running master_log_file relay_log_size read_master_log_pos slave_io_state)], + visible => [ qw(cxn channel_name master_host master_uuid slave_io_running master_log_file relay_log_size read_master_log_pos slave_io_state)], filters => [ qw( cxn_is_slave ) ], - sort_cols => 'slave_io_running cxn', + sort_cols => 'slave_io_running channel_name cxn', colors => [ { col => 'slave_io_running', op => 'ne', arg => 'Yes', color => 'black on_red' }, ], sort_dir => '1', innodb => '', - group_by => [], + group_by => [qw(channel_name)], aggregate => 0, }, slave_sql_status => { capt => 'Slave SQL Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, exec_master_log_pos => { src => 'exec_master_log_pos', hdr => 'Master Pos' }, last_errno => { src => 'last_errno' }, last_error => { src => 'last_error' }, master_host => { src => 'master_host', hdr => 'Master' }, + master_uuid => { src => '(master_uuid||"N/A")' }, relay_log_file => { src => 'relay_log_file' }, relay_log_pos => { src => 'relay_log_pos' }, relay_log_size => { src => 'relay_log_space', trans => [qw(shorten)] }, @@ -2695,6 +2944,7 @@ my %tbl_meta = ( replicate_wild_ignore_table => { src => 'replicate_wild_ignore_table' }, skip_counter => { src => 'skip_counter' }, slave_sql_running => { src => 'slave_sql_running', hdr => 'On?' }, + sort_time => { src => 'int(seconds_behind_master/60)' }, until_condition => { src => 'until_condition' }, until_log_file => { src => 'until_log_file' }, until_log_pos => { src => 'until_log_pos' }, @@ -2702,10 +2952,13 @@ my %tbl_meta = ( bytes_behind_master => { src => 'master_log_file && master_log_file eq relay_master_log_file ? read_master_log_pos - exec_master_log_pos : 0', trans => [qw(shorten)] }, slave_catchup_rate => { src => $exprs{SlaveCatchupRate}, trans => [ qw(set_precision) ] }, slave_open_temp_tables => { src => 'Slave_open_temp_tables' }, + retrieved_gtid_set => { src => '(retrieved_gtid_set||"N/A")' }, + executed_gtid_set => { src => '(executed_gtid_set||"N/A")' }, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, - visible => [ qw(cxn master_host slave_sql_running time_behind_master slave_catchup_rate slave_open_temp_tables relay_log_pos last_error)], + visible => [ qw(cxn channel_name master_host master_uuid slave_sql_running time_behind_master slave_catchup_rate slave_open_temp_tables relay_log_pos last_error retrieved_gtid_set executed_gtid_set)], filters => [ qw( cxn_is_slave ) ], - sort_cols => 'slave_sql_running cxn', + sort_cols => 'slave_sql_running -sort_time channel_name cxn', sort_dir => '1', innodb => '', colors => [ @@ -2714,6 +2967,27 @@ my %tbl_meta = ( { col => 'time_behind_master', op => '>', arg => 60, color => 'yellow' }, { col => 'time_behind_master', op => '==', arg => 0, color => 'white' }, ], + group_by => [qw(channel_name)], + aggregate => 0, + }, + table_statistics => { + capt => 'Data from TABLE_STATISTICS', + cust => {}, + cols => { + cxn => { src => 'cxn', minw => 6, maxw => 10 }, + db => { src => 'table_schema' }, + tbl => { src => 'table_name' }, + rows_read => { src => 'rows_read' }, + rows_changed => { src => 'rows_changed' }, + rows_changed_x_indexes => { src => 'rows_changed_x_indexes' }, + }, + visible => [ qw(cxn db tbl rows_read rows_changed rows_changed_x_indexes) ], + filters => [ ], + sort_cols => 'rows_read', + sort_dir => '-1', + innodb => '', + colors => [], + hide_caption => 1, group_by => [], aggregate => 0, }, @@ -2789,6 +3063,43 @@ my %tbl_meta = ( group_by => [], aggregate => 0, }, + health_dashboard => { + capt => 'Health Dashboard', + hide_caption => 1, + cust => {}, + cols => { + cxn => { src => 'cxn' }, + uptime => { src => 'Uptime', trans => [qw(fuzzy_time)] }, + qps => { src => 'Questions/Uptime_hires', dec => 1, trans => [qw(shorten)] }, + spark_qps => { src => 'SPARK_qps' }, + run => { src => 'User_threads_running' }, + spark_run => { src => 'SPARK_run' }, + max_query_time => { src => 'Max_query_time', trans => [qw(fuzzy_time)] }, + connections => { src => 'Threads_connected' }, + miss_rate => { src => 'Innodb_buffer_pool_reads/Uptime_hires', trans => [qw(set_precision)] }, + locked_count => { src => 'Locked_count' }, + 'open' => { src => 'Open_tables' }, + slave_running => { src => 'Slave_ok . " " . (Slaves || "")' }, + time_behind_master => { src => 'seconds_behind_master', hdr => 'ReplLag' , trans => [qw(fuzzy_time)] }, + longest_sql => { src => 'Longest_sql', trans => [qw(distill)] }, + }, + visible => [qw( + cxn uptime max_query_time time_behind_master qps connections run + miss_rate locked_count open slave_running longest_sql + )], + filters => [], + sort_cols => 'cxn', + sort_dir => '1', + innodb => '', + colors => [ + { col => 'slave_running', op => '=~', arg => 'No', color => 'black on_red' }, + { col => 'max_query_time', op => '>', arg => 30 * 60, color => 'red' }, + { col => 'max_query_time', op => '>', arg => 600, color => 'yellow' }, + { col => 'time_behind_master', op => '>', arg => 3600, color => 'cyan' }, + ], + group_by => [], + aggregate => 0, + }, ); # Initialize %tbl_meta from %columns and do some checks. @@ -2849,6 +3160,35 @@ foreach my $table_name ( keys %tbl_meta ) { # Operating modes {{{3 # ########################################################################### my %modes = ( + A => { + hdr => 'Dashboard', + cust => {}, + note => 'Shows health/status dashboard', + action_for => { + k => { + action => sub { kill_query('CONNECTION') }, + label => "Kill a query's connection", + }, + x => { + action => sub { kill_query('QUERY') }, + label => "Kill a query", + }, + r => { + action => sub { reverse_sort('health_dashboard'); }, + label => 'Reverse sort order', + }, + s => { + action => sub { choose_sort_cols('health_dashboard'); }, + label => "Choose sort column", + }, + }, + display_sub => \&display_A, + connections => [], + server_group => '', + one_connection => 0, + tables => [qw(health_dashboard)], + visible_tables => [qw(health_dashboard)], + }, B => { hdr => 'InnoDB Buffers', cust => {}, @@ -2933,6 +3273,23 @@ my %modes = ( tables => [qw(io_threads pending_io file_io_misc log_statistics)], visible_tables => [qw(io_threads pending_io file_io_misc log_statistics)], }, + K => { + hdr => 'InnoDB Lock Waits', + cust => {}, + note => 'Shows blocked and blocking transactions', + action_for => { + k => { + action => sub { kill_query('CONNECTION') }, + label => "Kill a query's connection", + }, + }, + display_sub => \&display_K, + connections => [], + server_group => '', + one_connection => 0, + tables => [qw(innodb_blocked_blocker)], + visible_tables => [qw(innodb_blocked_blocker)], + }, L => { hdr => 'Locks', cust => {}, @@ -3004,6 +3361,35 @@ my %modes = ( tables => [qw(open_tables)], visible_tables => [qw(open_tables)], }, + U => { + hdr => 'User Statistics', + cust => {}, + note => 'Displays Percona/MariaDB enhancements such as table statistics', + action_for => { + i => { + action => sub { set_visible_table('index_statistics') }, + label => 'Switch to INDEX_STATISTICS', + }, + s => { + action => sub { $clear_screen_sub->(); send_cmd_to_servers('SET @@global.userstat_running := 1 - @@global.userstat_running', 1, undef, []); }, + label => "Change the display's sort column", + }, + t => { + action => sub { set_visible_table('table_statistics') }, + label => 'Switch to TABLE_STATISTICS', + }, + x => { + action => sub { set_visible_table('index_table_statistics') }, + label => 'Switch to {INDEX,TABLE}_STATISTICS', + }, + }, + display_sub => \&display_P, + connections => [], + server_group => '', + one_connection => 0, + tables => [qw(table_statistics index_statistics index_table_statistics)], + visible_tables => [qw(index_table_statistics)], + }, Q => { hdr => 'Query List', cust => {}, @@ -3045,6 +3431,10 @@ my %modes = ( action => sub { choose_sort_cols('processlist'); }, label => "Change the display's sort column", }, + t => { + action => sub { toggle_filter('processlist', 'hide_connect') }, + label => 'Toggle slave processes', + }, x => { action => sub { kill_query('QUERY') }, label => "Kill a query", @@ -3239,6 +3629,10 @@ my %action_for = ( label => 'Toggle aggregation', }, # TODO: can these be auto-generated from %modes? + A => { + action => sub { switch_mode('A') }, + label => '', + }, B => { action => sub { switch_mode('B') }, label => '', @@ -3259,6 +3653,10 @@ my %action_for = ( action => sub { switch_mode('I') }, label => '', }, + K => { + action => sub { switch_mode('K') }, + label => '', + }, L => { action => sub { switch_mode('L') }, label => '', @@ -3287,6 +3685,10 @@ my %action_for = ( action => sub { switch_mode('T') }, label => '', }, + U => { + action => sub { switch_mode('U') }, + label => '', + }, d => { action => sub { get_config_interactive('interval') }, label => 'Change refresh interval', @@ -3554,6 +3956,7 @@ my %tbl_editor_action = ( dec => 0, agg => 0, aggonly => 0, + agghide => 0, }; $tbl_meta{$tbl}->{visible} = [ unique(@{$tbl_meta{$tbl}->{visible}}, $col) ]; @@ -3754,6 +4157,8 @@ my $nonfatal_errs = join('|', 'Cannot call SHOW INNODB STATUS', 'Access denied', 'AutoCommit', + 'Lost connection to MySQL server', + 'Too many connections', ); if ( !$opts{n} ) { @@ -3766,8 +4171,10 @@ if ( !$opts{n} ) { # keyed on clock tick. my %vars; my %info_gotten = (); # Which things have been retrieved for the current clock tick. +my %show_variables; # Stores SHOW VARIABLES for each cxn so we don't re-fetch. -# Stores info on currently displayed queries: cxn, connection ID, query text. +# Stores info on currently displayed queries: cxn, connection ID, query text, +# user, and host. my @current_queries; my $lines_printed = 0; @@ -3935,7 +4342,7 @@ my %config = ( conf => 'ALL', }, mode => { - val => "Q", + val => "A", note => "Which mode to start in", cmdline => 1, }, @@ -3961,6 +4368,17 @@ my %config = ( note => 'Which set of variables to display in S (Variables & Status) mode', conf => [ qw(S) ], }, + timeformat => { + val => '%Y-%m-%dT%H:%M:%S', + pat => qr//, + note => 'The strftime() timestamp format to write in -n mode', + }, + spark => { + val => 10, + note => 'How long to make status variable sparklines', + conf => 'ALL', + pat => $int_regex, + }, ); # ########################################################################### @@ -4076,57 +4494,196 @@ my %pluggable_vars = ( # given DB connection. Returns a $sth. # ########################################################################### my %stmt_maker_for = ( + INDEX_STATISTICS => sub { + my ( $dbh ) = @_; + # Detect whether there's a Percona Server with INFORMATION_SCHEMA.INDEX_STATISTICS + # and if not, just select nothing. + my $sth; + eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. + my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.INDEX_STATISTICS}); + if ( @$cols ) { + $sth = $dbh->prepare(q{SELECT /*innotop*/ * FROM INFORMATION_SCHEMA.INDEX_STATISTICS}); + } + }; + $sth ||= $dbh->prepare(q{SELECT /*innotop*/ '' FROM DUAL WHERE 1 = 0}); + return $sth; + }, + INDEX_TABLE_STATISTICS => sub { + my ( $dbh ) = @_; + # Detect whether there's a Percona Server with INFORMATION_SCHEMA.INDEX_STATISTICS + # and if not, just select nothing. + my $sth; + eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. + my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.INDEX_STATISTICS}); + if ( @$cols ) { + $sth = $dbh->prepare(q{SELECT /*innotop*/ L.TABLE_SCHEMA, L.TABLE_NAME, } + . q{SUM(L.ROWS_READ) AS ROWS_READ, SUM(R.ROWS_READ) AS ROWS_READ_FROM_INDEXES, } + . q{SUM(L.ROWS_CHANGED) AS ROWS_CHANGED, } + . q{SUM(L.ROWS_CHANGED_X_INDEXES) AS ROWS_CHANGED_X_INDEXES } + . q{FROM INFORMATION_SCHEMA.TABLE_STATISTICS AS L LEFT JOIN INFORMATION_SCHEMA.INDEX_STATISTICS AS R } + . q{USING(TABLE_SCHEMA, TABLE_NAME) GROUP BY L.TABLE_SCHEMA, L.TABLE_NAME}); + } + }; + $sth ||= $dbh->prepare(q{SELECT /*innotop*/ '' FROM DUAL WHERE 1 = 0}); + return $sth; + }, + INNODB_BLOCKED_BLOCKER => sub { + my ( $dbh ) = @_; + # Detect whether the server supports the I_S tables and if not, just select nothing. + my $sth; + eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. + my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS}); + if ( @$cols ) { + if ($dbh->{mysql_serverinfo} =~ /^5.1/) { + $sth = $dbh->prepare(q{ + SELECT /*innotop*/ + r.trx_mysql_thread_id AS waiting_thread, + r.trx_query AS waiting_query, + "n/a" AS waiting_rows_modified, + TIMESTAMPDIFF(SECOND, r.trx_started, NOW()) AS waiting_age, + TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS waiting_wait_secs, + rp.user AS waiting_user, + rp.host AS waiting_host, + rp.db AS waiting_db, + b.trx_mysql_thread_id AS blocking_thread, + b.trx_query AS blocking_query, + "n/a" AS blocking_rows_modified, + TIMESTAMPDIFF(SECOND, b.trx_started, NOW()) AS blocking_age, + TIMESTAMPDIFF(SECOND, b.trx_wait_started, NOW()) AS blocking_wait_secs, + bp.user AS blocking_user, + bp.host AS blocking_host, + bp.db AS blocking_db, + CONCAT(bp.command, IF(bp.command = 'Sleep', CONCAT(' ', bp.time), '')) AS blocking_status, + CONCAT(lock_mode, ' ', lock_type, ' ', lock_table, '(', lock_index, ')') AS lock_info + FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS w + JOIN INFORMATION_SCHEMA.INNODB_TRX b ON b.trx_id = w.blocking_trx_id + JOIN INFORMATION_SCHEMA.INNODB_TRX r ON r.trx_id = w.requesting_trx_id + JOIN INFORMATION_SCHEMA.INNODB_LOCKS l ON l.lock_id = w.requested_lock_id + LEFT JOIN INFORMATION_SCHEMA.PROCESSLIST bp ON bp.id = b.trx_mysql_thread_id + LEFT JOIN INFORMATION_SCHEMA.PROCESSLIST rp ON rp.id = r.trx_mysql_thread_id + }); + } else { + $sth = $dbh->prepare(q{ + SELECT /*innotop*/ + r.trx_mysql_thread_id AS waiting_thread, + r.trx_query AS waiting_query, + r.trx_rows_modified AS waiting_rows_modified, + TIMESTAMPDIFF(SECOND, r.trx_started, NOW()) AS waiting_age, + TIMESTAMPDIFF(SECOND, r.trx_wait_started, NOW()) AS waiting_wait_secs, + rp.user AS waiting_user, + rp.host AS waiting_host, + rp.db AS waiting_db, + b.trx_mysql_thread_id AS blocking_thread, + b.trx_query AS blocking_query, + b.trx_rows_modified AS blocking_rows_modified, + TIMESTAMPDIFF(SECOND, b.trx_started, NOW()) AS blocking_age, + TIMESTAMPDIFF(SECOND, b.trx_wait_started, NOW()) AS blocking_wait_secs, + bp.user AS blocking_user, + bp.host AS blocking_host, + bp.db AS blocking_db, + CONCAT(bp.command, IF(bp.command = 'Sleep', CONCAT(' ', bp.time), '')) AS blocking_status, + CONCAT(lock_mode, ' ', lock_type, ' ', lock_table, '(', lock_index, ')') AS lock_info + FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS w + JOIN INFORMATION_SCHEMA.INNODB_TRX b ON b.trx_id = w.blocking_trx_id + JOIN INFORMATION_SCHEMA.INNODB_TRX r ON r.trx_id = w.requesting_trx_id + JOIN INFORMATION_SCHEMA.INNODB_LOCKS l ON l.lock_id = w.requested_lock_id + LEFT JOIN INFORMATION_SCHEMA.PROCESSLIST bp ON bp.id = b.trx_mysql_thread_id + LEFT JOIN INFORMATION_SCHEMA.PROCESSLIST rp ON rp.id = r.trx_mysql_thread_id + }); + } + } + }; + $sth ||= $dbh->prepare(q{SELECT /*innotop*/ '' FROM DUAL WHERE 1 = 0}); + return $sth; + }, INNODB_STATUS => sub { my ( $dbh ) = @_; return $dbh->prepare(version_ge( $dbh, '5.0.0' ) - ? 'SHOW ENGINE INNODB STATUS' - : 'SHOW INNODB STATUS'); + ? 'SHOW /*innotop*/ ENGINE INNODB STATUS' + : 'SHOW /*innotop*/ INNODB STATUS'); }, SHOW_VARIABLES => sub { my ( $dbh ) = @_; return $dbh->prepare($config{global}->{val} && version_ge( $dbh, '4.0.3' ) - ? 'SHOW GLOBAL VARIABLES' - : 'SHOW VARIABLES'); + ? 'SHOW /*innotop*/ GLOBAL VARIABLES' + : 'SHOW /*innotop*/ VARIABLES'); }, SHOW_STATUS => sub { my ( $dbh ) = @_; return $dbh->prepare($config{global}->{val} && version_ge( $dbh, '5.0.2' ) - ? 'SHOW GLOBAL STATUS' - : 'SHOW STATUS'); + ? 'SHOW /*innotop*/ GLOBAL STATUS' + : 'SHOW /*innotop*/ STATUS'); }, KILL_QUERY => sub { my ( $dbh ) = @_; return $dbh->prepare(version_ge( $dbh, '5.0.0' ) - ? 'KILL QUERY ?' - : 'KILL ?'); + ? 'KILL /*innotop*/ QUERY ?' + : 'KILL /*innotop*/ ?'); }, SHOW_MASTER_LOGS => sub { my ( $dbh ) = @_; - return $dbh->prepare('SHOW MASTER LOGS'); + return $dbh->prepare('SHOW /*innotop*/ MASTER LOGS'); }, SHOW_MASTER_STATUS => sub { my ( $dbh ) = @_; - return $dbh->prepare('SHOW MASTER STATUS'); + return $dbh->prepare('SHOW /*innotop*/ MASTER STATUS'); }, SHOW_SLAVE_STATUS => sub { my ( $dbh ) = @_; - return $dbh->prepare('SHOW SLAVE STATUS'); + return $dbh->prepare('SHOW /*innotop*/ SLAVE STATUS'); + }, + GET_CHANNELS => sub { + my ( $dbh ) = @_; + return $dbh->prepare(version_ge( $dbh, '5.7.0' ) + ? 'select CHANNEL_NAME from performance_schema.replication_applier_status where CHANNEL_NAME regexp "^[a-zA-Z].*";' + : 'select "no_channels"'); }, KILL_CONNECTION => sub { my ( $dbh ) = @_; return $dbh->prepare(version_ge( $dbh, '5.0.0' ) - ? 'KILL CONNECTION ?' - : 'KILL ?'); + ? 'KILL /*innotop*/ CONNECTION ?' + : 'KILL /*innotop*/ ?'); }, OPEN_TABLES => sub { my ( $dbh ) = @_; return version_ge($dbh, '4.0.0') - ? $dbh->prepare('SHOW OPEN TABLES') + ? $dbh->prepare('SHOW /*innotop*/ OPEN TABLES') : undef; }, PROCESSLIST => sub { my ( $dbh ) = @_; - return $dbh->prepare('SHOW FULL PROCESSLIST'); + # In newer versions of the server, use INFORMATION_SCHEMA table if it exists, + # and use the TIME_MS column (in Percona Server) if that exists. + my $sth; + eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. + my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.PROCESSLIST LIKE 'TIME_MS'}); + if ( @$cols ) { # The TIME_MS colum exists + $sth = $dbh->prepare(q{SELECT /*innotop*/ ID, USER, HOST, DB, COMMAND, CASE WHEN TIME_MS/1000 > 365*86400 THEN TIME ELSE TIME_MS/1000 END AS TIME, STATE, INFO FROM INFORMATION_SCHEMA.PROCESSLIST}); + } + }; + $sth ||= $dbh->prepare('SHOW /*innotop*/ FULL PROCESSLIST'); + return $sth; + }, + PROCESSLIST_NO_IS => sub { + my ( $dbh ) = @_; + # We do not use INFORMATION_SCHEMA table because it doesn't show slave + # SQL statements. http://bugs.mysql.com/66401 + my $sth = $dbh->prepare('SHOW /*innotop*/ FULL PROCESSLIST'); + return $sth; + }, + TABLE_STATISTICS => sub { + my ( $dbh ) = @_; + # Detect whether there's a Percona Server with INFORMATION_SCHEMA.TABLE_STATISTICS + # and if not, just select nothing. + my $sth; + eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. + my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.TABLE_STATISTICS}); + if ( @$cols ) { + $sth = $dbh->prepare(q{SELECT /*innotop*/ * FROM INFORMATION_SCHEMA.TABLE_STATISTICS}); + } + }; + $sth ||= $dbh->prepare(q{SELECT /*innotop*/ '' FROM DUAL WHERE 1 = 0}); + return $sth; }, ); @@ -4137,137 +4694,144 @@ my %plugins = ( # ########################################################################### # Run the program {{{1 # ########################################################################### - -# This config variable is only useful for MS Windows because its terminal -# can't tell how tall it is. -if ( !$windows ) { - delete $config{max_height}; -} - -# Try to lower my priority. -eval { setpriority(0, 0, getpriority(0, 0) + 10); }; - -# Print stuff to the screen immediately, don't wait for a newline. -$OUTPUT_AUTOFLUSH = 1; - -# Clear the screen and load the configuration. -$clear_screen_sub->(); -load_config(); - -# Override config variables with command-line options -my %cmdline = - map { $_->{c} => $opts{$_->{k}} } - grep { exists $_->{c} && exists $opts{$_->{k}} } - @opt_spec; - -foreach my $name (keys %cmdline) { - next if not defined $cmdline{$name}; - my $val = $cmdline{$name}; - if ( exists($config{$name}) and (!$config{$name}->{pat} or $val =~ m/$config{$name}->{pat}/ )) { - $config{$name}->{val} = $val; +sub main { + # This config variable is only useful for MS Windows because its terminal + # can't tell how tall it is. + if ( !$windows ) { + delete $config{max_height}; } -} - -post_process_tbl_meta(); - -# Make sure no changes are written to config file in non-interactive mode. -if ( $opts{n} ) { - $config{readonly}->{val} = 1; -} - -eval { - - # Open the file for InnoDB status - if ( @ARGV ) { - my $filename = shift @ARGV; - open $file, "<", $filename - or die "Cannot open '$filename': $OS_ERROR"; + + # Try to lower my priority. + eval { setpriority(0, 0, getpriority(0, 0) + 10); }; + + # Print stuff to the screen immediately, don't wait for a newline. + $OUTPUT_AUTOFLUSH = 1; + + # Clear the screen and load the configuration. + $clear_screen_sub->(); + load_config(); + + # Override config variables with command-line options + my %cmdline = + map { $_->{c} => $opts{$_->{k}} } + grep { exists $_->{c} && exists $opts{$_->{k}} } + @opt_spec; + + foreach my $name (keys %cmdline) { + next if not defined $cmdline{$name}; + my $val = $cmdline{$name}; + if ( exists($config{$name}) and (!$config{$name}->{pat} or $val =~ m/$config{$name}->{pat}/ )) { + $config{$name}->{val} = $val; + } } - - # In certain modes we might have to collect data for two cycles - # before printing anything out, so we need to bump up the count one. - if ( $opts{n} && $opts{count} && $config{status_inc}->{val} - && $config{mode}->{val} =~ m/[S]/ ) - { - $opts{count}++; + + post_process_tbl_meta(); + + # Make sure no changes are written to config file in non-interactive mode. + if ( $opts{n} ) { + $config{readonly}->{val} = 1; } - - while (++$clock) { - - my $mode = $config{mode}->{val} || 'Q'; - if ( !$modes{$mode} ) { - die "Mode '$mode' doesn't exist; try one of these:\n" - . join("\n", map { " $_ $modes{$_}->{hdr}" } sort keys %modes) - . "\n"; - } - - if ( !$opts{n} ) { - @last_term_size = @this_term_size; - @this_term_size = Term::ReadKey::GetTerminalSize(\*STDOUT); - if ( $windows ) { - $this_term_size[0]--; - $this_term_size[1] - = min($this_term_size[1], $config{max_height}->{val}); - } - die("Can't read terminal size") unless @this_term_size; + + eval { + + # Open the file for InnoDB status + if ( @ARGV ) { + my $filename = shift @ARGV; + open $file, "<", $filename + or die "Cannot open '$filename': $OS_ERROR"; } - - # If there's no connection to a database server, we need to fix that... - if ( !%connections ) { - print "You have not defined any database connections.\n\n"; - add_new_dsn(); + + # In certain modes we might have to collect data for two cycles + # before printing anything out, so we need to bump up the count one. + if ( $opts{n} && $opts{count} && $config{status_inc}->{val} + && $config{mode}->{val} =~ m/[S]/ ) + { + $opts{count}++; } + + while (++$clock) { + + my $mode = $config{mode}->{val} || 'Q'; + if ( !$modes{$mode} ) { + die "Mode '$mode' doesn't exist; try one of these:\n" + . join("\n", map { " $_ $modes{$_}->{hdr}" } sort keys %modes) + . "\n"; + } + + if ( !$opts{n} ) { + @last_term_size = @this_term_size; + @this_term_size = Term::ReadKey::GetTerminalSize(\*STDOUT); + if ( $windows ) { + $this_term_size[0]--; + $this_term_size[1] + = min($this_term_size[1], $config{max_height}->{val}); + } + die("Can't read terminal size") unless @this_term_size; + } + + # If there's no connection to a database server, we need to fix that... + if ( !%connections ) { + print "You have not defined any database connections.\n\n"; + add_new_dsn(); + } + + # See whether there are any connections defined for this mode. If there's only one + # connection total, assume the user wants to just use innotop for a single server + # and don't ask which server to connect to. Also, if we're monitoring from a file, + # we just use the first connection. + if ( !get_connections() ) { + if ( $file || 1 == scalar keys %connections ) { + $modes{$config{mode}->{val}}->{connections} = [ keys %connections ]; + } + else { + choose_connections(); + } + } + + # Term::ReadLine might have re-set $OUTPUT_AUTOFLUSH. + $OUTPUT_AUTOFLUSH = 1; + + # Prune old data + my $sets = $config{num_status_sets}->{val}; + foreach my $store ( values %vars ) { + delete @{$store}{ grep { $_ < $clock - $sets } keys %$store }; + } + %info_gotten = (); + + # Call the subroutine to display this mode. + $modes{$mode}->{display_sub}->(); + + # It may be time to quit now. + if ( $opts{count} && $clock >= $opts{count} ) { + finish(); + } - # See whether there are any connections defined for this mode. If there's only one - # connection total, assume the user wants to just use innotop for a single server - # and don't ask which server to connect to. Also, if we're monitoring from a file, - # we just use the first connection. - if ( !get_connections() ) { - if ( $file || 1 == scalar keys %connections ) { - $modes{$config{mode}->{val}}->{connections} = [ keys %connections ]; + # RECON: Try to reconnect failed connections, while the user sees no lag. + foreach my $cxn ( grep { $dbhs{$_}->{failed} } keys %dbhs ) { + eval { connect_to_db($cxn); }; # Ignore errors entirely here. + } + + # Wait for a bit. + if ( $opts{n} ) { + sleep($config{interval}->{val}); } else { - choose_connections(); + ReadMode('cbreak'); + $char = ReadKey($config{interval}->{val}); + ReadMode('normal'); } + + # Handle whatever action the key indicates. + do_key_action(); + } - - # Term::ReadLine might have re-set $OUTPUT_AUTOFLUSH. - $OUTPUT_AUTOFLUSH = 1; - - # Prune old data - my $sets = $config{num_status_sets}->{val}; - foreach my $store ( values %vars ) { - delete @{$store}{ grep { $_ < $clock - $sets } keys %$store }; - } - %info_gotten = (); - - # Call the subroutine to display this mode. - $modes{$mode}->{display_sub}->(); - - # It may be time to quit now. - if ( $opts{count} && $clock >= $opts{count} ) { - finish(); - } - - # Wait for a bit. - if ( $opts{n} ) { - sleep($config{interval}->{val}); - } - else { - ReadMode('cbreak'); - $char = ReadKey($config{interval}->{val}); - ReadMode('normal'); - } - - # Handle whatever action the key indicates. - do_key_action(); - + }; + if ( $EVAL_ERROR ) { + core_dump( $EVAL_ERROR ); } -}; -if ( $EVAL_ERROR ) { - core_dump( $EVAL_ERROR ); + finish(); } -finish(); +main() unless caller(); # make me testable! # Subroutines {{{1 # Mode functions{{{2 @@ -4355,6 +4919,29 @@ sub prompt_noecho { return $response; } +# noecho_password {{{3 +# read password for command line parameters with noecho +sub noecho_password { + my $prompt = shift @_; + local $OUTPUT_AUTOFLUSH = 1; + my $response; + eval { + if ( $windows ) { + require Win32::Console::ANSI; + } + require Term::ANSIColor; + import Term::ANSIColor qw(colored); + $response = prompt_noecho($prompt); + print "\n" or die + "Cannot print: $OS_ERROR"; + }; + + if ( $EVAL_ERROR ) { + die "Cannot read respose; is Term::ReadKey installed? $EVAL_ERROR"; + } + return $response; +} + # do_key_action {{{3 # Depending on whether a key was read, do something. Keys have certain # actions defined in lookup tables. Each mode may have its own lookup table, @@ -4364,11 +4951,9 @@ sub do_key_action { if ( defined $char ) { my $mode = $config{mode}->{val}; my $action - = defined($modes{$mode}->{action_for}->{$char}) - ? $modes{$mode}->{action_for}->{$char}->{action} - : defined($action_for{$char}) - ? $action_for{$char}->{action} - : sub{}; + = defined($modes{$mode}->{action_for}->{$char}) ? $modes{$mode}->{action_for}->{$char}->{action} + : defined($action_for{$char}) ? $action_for{$char}->{action} + : sub{}; $action->(); } } @@ -4420,7 +5005,13 @@ sub kill_query { 'Select a thread to kill the ' . $q_or_c, ); return unless $info; - return unless pause("Kill $info->{id}?") =~ m/y/i; + my $distill = distill($info->{query} || ''); + $distill = " running '$distill'" if $distill; + return unless pause("Kill $info->{id} (" + . ($info->{user} || '') + . '@' + . ($info->{host} || '') + . ")$distill ? ") =~ m/y/i; eval { do_stmt($info->{cxn}, $q_or_c eq 'QUERY' ? 'KILL_QUERY' : 'KILL_CONNECTION', $info->{id} ); @@ -4491,6 +5082,10 @@ sub deadlock_thread { eval { my $dbh = get_new_db_connection($cxn, 1); + + # disable binary logging for this session + $dbh->do("set SQL_LOG_BIN=0"); + my @stmts = ( "set transaction isolation level serializable", (version_ge($dbh, '4.0.11') ? "start transaction" : 'begin'), @@ -4591,10 +5186,49 @@ sub start_S_mode { switch_mode('S'); } +# display_A {{{3 +sub display_A { + my @display_lines; + my @cxns = get_connections(); + get_processlist_stats(@cxns); + get_status_info(@cxns); + get_master_slave_status(@cxns); + my @visible = get_visible_tables(); + my %wanted = map { $_ => 1 } @visible; + my @health_dashboard; + my %rows_for = ( + health_dashboard => \@health_dashboard, + ); + + foreach my $cxn ( @cxns ) { + # Get the status variables + my $set = $vars{$cxn}->{$clock}; + my $pre = $vars{$cxn}->{$clock-1} || $set; + my $hash = extract_values($set, $set, $pre, 'health_dashboard'); + # Make QPS and Miss show now, not overall. + if ( exists $vars{$cxn}->{$clock - 1} ) { + my $inc = inc(0, $cxn); + my $hash2 = extract_values($inc, $set, $pre, 'health_dashboard'); + map { $hash->{$_} = $hash2->{$_} } qw(qps miss_rate); + } + push @health_dashboard, $hash; + } + + my $first_table = 0; + foreach my $tbl ( @visible ) { + push @display_lines, '', set_to_tbl($rows_for{$tbl}, $tbl); + push @display_lines, get_cxn_errors(@cxns) + if ( $config{debug}->{val} || !$first_table++ ); + } + + draw_screen(\@display_lines); +} + # display_B {{{3 sub display_B { my @display_lines; my @cxns = get_connections(); + get_status_info(@cxns); get_innodb_status(\@cxns); my @buffer_pool; @@ -4705,6 +5339,7 @@ sub display_C { sub display_D { my @display_lines; my @cxns = get_connections(); + get_status_info(@cxns); get_innodb_status(\@cxns); my @deadlock_transactions; @@ -4769,12 +5404,13 @@ sub display_D { sub display_F { my @display_lines; my ( $cxn ) = get_connections(); + get_status_info($cxn); get_innodb_status([$cxn]); my $innodb_status = $vars{$cxn}->{$clock}; if ( $innodb_status->{IB_fk_timestring} ) { - push @display_lines, 'Reason: ' . $innodb_status->{IB_fk_reason}; + push @display_lines, 'Reason: ' . ($innodb_status->{IB_fk_reason} || 'unknown'); # Display FK errors caused by invalid DML. if ( $innodb_status->{IB_fk_txn} ) { @@ -4803,6 +5439,7 @@ sub display_F { sub display_I { my @display_lines; my @cxns = get_connections(); + get_status_info(@cxns); get_innodb_status(\@cxns); my @io_threads; @@ -4859,10 +5496,52 @@ sub display_I { draw_screen(\@display_lines); } +# display_K {{{3 +sub display_K { + my @display_lines; + my @cxns = get_connections(); + + my %rows_for = ( + innodb_blocked_blocker => [], + ); + + my @visible = get_visible_tables(); + my %wanted = map { $_ => 1 } @visible; + + # Get info on locks + if ( $wanted{innodb_blocked_blocker} ) { + my @rows = get_innodb_blocked_blocker(@cxns); + push @{$rows_for{innodb_blocked_blocker}}, map { extract_values($_, $_, $_, 'innodb_blocked_blocker') } @rows; + } + + my $first_table = 0; + foreach my $tbl ( @visible ) { + push @display_lines, '', set_to_tbl($rows_for{$tbl}, $tbl); + push @display_lines, get_cxn_errors(@cxns) + if ( $config{debug}->{val} || !$first_table++ ); + } + + # Save queries in global variable for analysis. The rows in %rows_for have been + # filtered, etc as a side effect of set_to_tbl(), so they are the same as the rows + # that get pushed to the screen. + @current_queries = map { + my %hash; + @hash{ qw(cxn id user host db query time) } + = @{$_}{ qw(cxn blocking_thread blocking_user blocking_host blocking_db blocking_query blocking_age) }; + # time is in fuzzy-time format; convert into something ascii-sortable. + $hash{time} = sprintf('%012s', fuzzy_to_secs($hash{time})); + $hash{host} =~ s/:.*$// if $hash{host}; + \%hash; + } @{$rows_for{innodb_blocked_blocker}}; + + draw_screen(\@display_lines); +} + # display_L {{{3 sub display_L { my @display_lines; my @cxns = get_connections(); + get_status_info(@cxns); get_innodb_status(\@cxns); my @innodb_locks; @@ -4882,8 +5561,8 @@ sub display_L { my $cur_txns = $set->{IB_tx_transactions}; my $pre_txns = $pre->{IB_tx_transactions} || $cur_txns; - my %cur_txns = map { $_->{mysql_thread_id} => $_ } @$cur_txns; - my %pre_txns = map { $_->{mysql_thread_id} => $_ } @$pre_txns; + my %cur_txns = map { $_->{mysql_thread_id} => $_ } grep { defined $_->{mysql_thread_id} } @$cur_txns; + my %pre_txns = map { $_->{mysql_thread_id} => $_ } grep { defined $_->{mysql_thread_id} } @$pre_txns; foreach my $txn ( @$cur_txns ) { foreach my $lock ( @{$txn->{locks}} ) { my %hash = map { $_ => $txn->{$_} } qw(txn_id mysql_thread_id lock_wait_time active_secs); @@ -4925,18 +5604,46 @@ sub display_M { my %wanted = map { $_ => 1 } @visible; foreach my $cxn ( @cxns ) { - my $set = $config{status_inc}->{val} ? inc(0, $cxn) : $vars{$cxn}->{$clock}; - my $pre = $vars{$cxn}->{$clock - 1} || $set; - if ( $wanted{slave_sql_status} ) { - push @slave_sql_status, extract_values($set, $set, $pre, 'slave_sql_status'); - } - if ( $wanted{slave_io_status} ) { - push @slave_io_status, extract_values($set, $set, $pre, 'slave_io_status'); - } - if ( $wanted{master_status} ) { - push @master_status, extract_values($set, $set, $pre, 'master_status'); - } - } + my $linecount=0; + my $sth = do_stmt($cxn, 'GET_CHANNELS'); + my ( $channel ); + $sth->execute(); + $sth->bind_columns( \$channel ); + while ( $sth->fetch() ) { + $linecount=$linecount+1; + if ( length $channel < 1 ) { + $channel = 'no_channels'; + } + my $chcxn = $channel . '=' . $cxn; + get_slave_status($cxn,$channel); + my $set = $config{status_inc}->{val} ? inc(0, $chcxn) : $vars{$chcxn}->{$clock}; + my $pre = $vars{$chcxn}->{$clock - 1} || $set; + if ( $wanted{slave_sql_status} ) { + push @slave_sql_status, extract_values($set, $set, $pre, 'slave_sql_status'); + } + if ( $wanted{slave_io_status} ) { + push @slave_io_status, extract_values($set, $set, $pre, 'slave_io_status'); + } + } + if ( $linecount < 1 ) { + $channel = 'no_channels'; + my $chcxn = $channel . '=' . $cxn; + get_slave_status($cxn,$channel); + my $set = $config{status_inc}->{val} ? inc(0, $chcxn) : $vars{$chcxn}->{$clock}; + my $pre = $vars{$chcxn}->{$clock - 1} || $set; + if ( $wanted{slave_sql_status} ) { + push @slave_sql_status, extract_values($set, $set, $pre, 'slave_sql_status'); + } + if ( $wanted{slave_io_status} ) { + push @slave_io_status, extract_values($set, $set, $pre, 'slave_io_status'); + } + } + my $set = $config{status_inc}->{val} ? inc(0, $cxn) : $vars{$cxn}->{$clock}; + my $pre = $vars{$cxn}->{$clock - 1} || $set; + if ( $wanted{master_status} ) { + push @master_status, extract_values($set, $set, $pre, 'master_status'); + } + } my $first_table = 0; foreach my $tbl ( @visible ) { @@ -4958,6 +5665,49 @@ sub display_O { draw_screen(\@display_lines); } +# display_P {{{3 +sub display_P { + my @display_lines; + + my @table_statistics; + my @index_statistics; + my @index_table_statistics; + my %rows_for = ( + table_statistics => \@table_statistics, + index_statistics => \@index_statistics, + index_table_statistics => \@index_table_statistics, + ); + + my @visible = $opts{n} ? 'index_table_statistics' : get_visible_tables(); + my %wanted = map { $_ => 1 } @visible; + + # Get the data + my @cxns = get_connections(); + + if ( $wanted{table_statistics} ) { + my @rows = get_table_statistics(@cxns); + push @table_statistics, map { extract_values($_, $_, $_, 'table_statistics') } @rows; + } + elsif ( $wanted{index_statistics} ) { + my @rows = get_index_statistics(@cxns); + push @index_statistics, map { extract_values($_, $_, $_, 'index_statistics') } @rows; + } + elsif ( $wanted{index_table_statistics} ) { + my @rows = get_index_table_statistics(@cxns); + push @index_table_statistics, map { extract_values($_, $_, $_, 'index_table_statistics') } @rows; + } + + my $first_table = 0; + foreach my $tbl ( @visible ) { + next unless $wanted{$tbl}; + push @display_lines, '', set_to_tbl($rows_for{$tbl}, $tbl); + push @display_lines, get_cxn_errors(@cxns) + if ( $config{debug}->{val} || !$first_table++ ); + } + + draw_screen(\@display_lines); +} + # display_Q {{{3 sub display_Q { my @display_lines; @@ -5015,7 +5765,11 @@ sub display_Q { # that get pushed to the screen. @current_queries = map { my %hash; - @hash{ qw(cxn id db query secs) } = @{$_}{ qw(cxn mysql_thread_id db info secs) }; + @hash{ qw(cxn id db query time user host) } + = @{$_}{ qw(cxn mysql_thread_id db info time user hostname) }; + # time is in seconds-to-time format; convert into something + # ascii-sortable. + $hash{time} = sprintf('%012s', $hash{time} =~ m/^([^.]*)/); \%hash; } @{$rows_for{processlist}}; @@ -5026,6 +5780,7 @@ sub display_Q { sub display_R { my @display_lines; my @cxns = get_connections(); + get_status_info(@cxns); get_innodb_status(\@cxns); my @row_operations; @@ -5098,6 +5853,8 @@ sub display_T { my @cxns = get_connections(); + get_status_info(@cxns); + # If the header is to be shown, buffer pool data is required. get_innodb_status( \@cxns, [ $wanted{t_header} ? qw(bp) : () ] ); @@ -5115,8 +5872,8 @@ sub display_T { if ( $wanted{innodb_transactions} ) { my $cur_txns = $set->{IB_tx_transactions}; my $pre_txns = $pre->{IB_tx_transactions} || $cur_txns; - my %cur_txns = map { $_->{mysql_thread_id} => $_ } @$cur_txns; - my %pre_txns = map { $_->{mysql_thread_id} => $_ } @$pre_txns; + my %cur_txns = map { $_->{mysql_thread_id} => $_ } grep { defined $_->{mysql_thread_id} } @$cur_txns; + my %pre_txns = map { $_->{mysql_thread_id} => $_ } grep { defined $_->{mysql_thread_id} } @$pre_txns; foreach my $thd_id ( sort keys %cur_txns ) { my $cur_txn = $cur_txns{$thd_id}; my $pre_txn = $pre_txns{$thd_id} || $cur_txn; @@ -5140,7 +5897,8 @@ sub display_T { # that get pushed to the screen. @current_queries = map { my %hash; - @hash{ qw(cxn id db query secs) } = @{$_}{ qw(cxn mysql_thread_id db query_text active_secs) }; + @hash{ qw(cxn id db query time user host) } + = @{$_}{ qw(cxn mysql_thread_id db query_text active_secs user hostname) }; \%hash; } @{$rows_for{innodb_transactions}}; @@ -5468,7 +6226,10 @@ sub display_help { } # Magic keys - my @all_magic = map { sprintf('%4s', $action_for{$_}->{key} || $_) . " $keys{$_}" } @magic; + my @all_magic = map { + my $k = $action_for{$_} ? ($action_for{$_}->{key} || $_) : $_; + sprintf('%4s %s', $k, $keys{$_}); + } @magic; @col1 = splice(@all_magic, 0, ceil(@all_magic/2)); $max1 = max(map {length($_)} @col1); push @display_lines, '', 'Other:'; @@ -5781,14 +6542,32 @@ sub set_to_tbl { my ( $rows, $tbl ) = @_; my $meta = $tbl_meta{$tbl} or die "No such table $tbl in tbl_meta"; - # don't show cxn if there's only one connection being displayed - my @visible; - if (scalar @{$modes{$config{mode}->{val}}->{connections}} == 1) { + # don't show / hide cxn if there's only one connection being displayed + my (@visible, @group_by); + my $num_cxn = scalar get_connections(); + if ($num_cxn <= 1) { map { push @visible, $_ if $_ !~ /^cxn$/ } @{$meta->{visible}}; - delete $$rows[0]{cxn} if defined $$rows[0]{cxn}; + $meta->{visible} = \@visible; + map { push @group_by, $_ if $_ !~ /^cxn$/ } @{$meta->{group_by}}; + $meta->{group_by} = \@group_by; } + # if cxn is not visible and there is now more than one connection, + # make cxn visible again. assume it's not in group_by if it's not + # visible else { - @visible = @{$meta->{visible}}; + my $has_cxn = 0; + foreach my $column (@{$meta->{visible}}) { + if ($column eq "cxn") { + $has_cxn = 1; + last; + } + } + if (not $has_cxn) { + map { push @visible, $_ if $_ !~ /^cxn$/ } @{$meta->{visible}}; + $meta->{visible} = \@visible; + map { push @group_by, $_ if $_ !~ /^cxn$/ } @{$meta->{group_by}}; + $meta->{group_by} = \@group_by; + } } if ( !$meta->{pivot} ) { @@ -5943,14 +6722,15 @@ sub set_to_tbl { # If the table isn't pivoted, just show all columns that are supposed to # be shown; but eliminate aggonly columns if the table isn't aggregated. my $aggregated = $meta->{aggregate}; - $fmt_cols = [ grep { $aggregated || !$meta->{cols}->{$_}->{aggonly} } @visible ]; + $fmt_cols = [ grep { $aggregated || !$meta->{cols}->{$_}->{aggonly} } @{$meta->{visible}} ]; $fmt_meta = { map { $_ => $meta->{cols}->{$_} } @$fmt_cols }; # If the table is aggregated, re-order the group_by columns to the left of - # the display. + # the display, and suppress 'agghide' columns. if ( $aggregated ) { my %is_group = map { $_ => 1 } @{$meta->{group_by}}; $fmt_cols = [ @{$meta->{group_by}}, grep { !$is_group{$_} } @$fmt_cols ]; + $fmt_cols = [ grep { !$meta->{cols}->{$_}->{agghide} } @$fmt_cols ]; } } @@ -5991,6 +6771,7 @@ sub commify { # Trim to desired precision. sub set_precision { my ( $num, $precision ) = @_; + $num = 0 unless defined $num; $precision = $config{num_digits}->{val} if !defined $precision; sprintf("%.${precision}f", $num); } @@ -6005,6 +6786,23 @@ sub percent { . ($config{show_percent}->{val} ? '%' : ''); } +# sparkify {{{3 +# Find the range (min to max) and divide it up. Each value then gets put into +# a bucket and represented by one of these characters: _.-=^ +sub sparkify { + my @vals = @_; + my @chars = qw(_ . - = ^); + my $min = min(@vals); + my $max = max(@vals); + my $range = ($max - $min) / 4; + return "_" x scalar(@vals) if !$min || !$max || $max == $min || !$range; + my $result = ""; + foreach my $v ( @vals ) { + $result .= $chars[ int(($v - $min) / $range) ]; + } + return $result; +} + # shorten {{{3 sub shorten { my ( $num, $opts ) = @_; @@ -6023,12 +6821,9 @@ sub shorten { $num /= 1_024; ++$n; } - return sprintf( - $num =~ m/\./ || $n || $force - ? "%.${num_digits}f%s" - : '%d', - $num, ($pad,'k','M','G', 'T')[$n]); - + return $num =~ m/\./ || $n || $force + ? sprintf("%.${num_digits}f%s", $num, ($pad,'k','M','G','T')[$n]) + : $num; } # Utility functions {{{2 @@ -6214,12 +7009,23 @@ sub draw_screen { if $prefs->{clear} || !$modes{$config{mode}->{val}}->{no_clear_screen}; if ( $opts{n} || $prefs->{raw} ) { my $num_lines = 0; + my $ts = $opts{t} ? POSIX::strftime($config{timeformat}->{val}, localtime) : ''; + if ( $opts{t} ) { + if ( $opts{t} == 1 ) { + print "\n$ts\n\n"; + $ts = ""; # Prevent it from being written on every line. + $num_lines++; + } + else { + $ts .= " "; + } + } print join("\n", map { $num_lines++; ref $_ - ? colored($_->[0], $_->[1]) - : $_; + ? colored($ts . $_->[0], $_->[1]) + : $ts . $_; } grep { !$opts{n} || $_ } # Suppress empty lines @$display_lines); @@ -6240,11 +7046,169 @@ sub draw_screen { } } +# fuzzy_time {{{3 +sub fuzzy_time { + my ( $secs ) = @_; + return '' unless $secs; + return sprintf('%.2f', $secs) if $secs =~ m/^.\./; + $secs =~ s/\..*$//; + return $secs < 180 ? "${secs}s" + : $secs < 3600 ? sprintf("%dm", $secs / 60) + : $secs < 3600 * 3 ? sprintf("%dh%dm", $secs / 3600, ($secs % 3600) / 60) + : $secs < 86400 ? sprintf("%dh", $secs / 3600) + : $secs < 86400* 3 ? sprintf("%dd%dh", $secs / 86400, ($secs % 86400) / 3600) + : sprintf("%dd", $secs / 86400); +} + +sub fuzzy_to_secs { + my ($t) = @_; + return 0 unless $t; + my ($num, $suffix) = $t =~ m/(\d+)([a-z])?$/; + return $num unless $suffix; + return $suffix eq 's' ? $num # Seconds + : $suffix eq 'm' ? $num * 60 # Minutes + : $suffix eq 'h' ? $num * 3600 # Hours + : $num * 86400; # Days +} + +# distill {{{3 +sub distill { + my ( $query ) = @_; + return "" unless $query; + my $orig_query = $query; + + $query =~ m/\A\s*call\s+(\S+)\(/i && return "CALL $1"; + $query =~ m/\A\s*use\s+/ && return "USE"; + $query =~ m/\A\s*UNLOCK TABLES/i && return "UNLOCK"; + $query =~ m/\A\s*xa\s+(\S+)/i && return "XA_$1"; + + # Strip out comments + my $olc_re = qr/(?:--|#)[^'"\r\n]*(?=[\r\n]|\Z)/; # One-line comments + my $mlc_re = qr#/\*[^!].*?\*/#sm; # But not /*!version */ + my $vlc_re = qr#/\*.*?[0-9+].*?\*/#sm; # For SHOW + /*!version */ + my $vlc_rf = qr#^(SHOW).*?/\*![0-9+].*?\*/#sm; # Variation for SHOW + $query =~ s/$olc_re//go; + $query =~ s/$mlc_re//go; + if ( $query =~ m/$vlc_rf/i ) { # contains show + version + $query =~ s/$vlc_re//go; + } + + # Handle SHOW queries + if ( $query =~ m/\A\s*SHOW\s+/i ) { + $query = uc $query; + $query =~ s/\s+(?:GLOBAL|SESSION|FULL|STORAGE|ENGINE)\b/ /g; + $query =~ s/\s+COUNT[^)]+\)//g; + $query =~ s/\s+(?:FOR|FROM|LIKE|WHERE|LIMIT|IN)\b.+//ms; + $query =~ s/\A(SHOW(?:\s+\S+){1,2}).*\Z/$1/s; + $query =~ s/\s+/ /g; + } + + # Find verbs and tables. + my ($verbs, $table); + + # Handle DDL operations (dds) + my $tbl_ident = qr/(?:`[^`]+`|\w+)(?:\.(?:`[^`]+`|\w+))?/; + my $tbl_regex = qr{ + \b(?:FROM|JOIN|(?<!KEY\s)UPDATE|INTO(?!\s+TABLE)|INTO\s+TABLE) # Words that precede table names + \b\s* + \(? # Optional paren around tables + ($tbl_ident + (?: (?:\s+ (?:AS\s+)? \w+)?, \s*$tbl_ident )* + ) + }xio; + my ( $ddl ) = $query =~ m/^\s*((?:CREATE|ALTER|TRUNCATE|DROP|RENAME|CHECK|REPAIR))\b/i; + if ( $ddl ) { + my ( $obj ) = $query =~ m/$ddl.+(DATABASE|EVENT|FUNCTION|INDEX|LOGFILE GROUP|PROCEDURE|SERVER|TABLE|TABLESPACE|TRIGGER|VIEW)\b/i; + if ( $obj ) { + $query =~ s/$obj\s*if\s*(?:not\s*)?exists/$obj/i; + $verbs = uc($ddl . ($obj ? " $obj" : '')); + ($table) = $query =~ m/(?:TABLE|DATABASE)\s+($tbl_ident)(\s+.*)?/i; + } + } + else { + my $verbs_pat = qr{^SHOW|^FLUSH|^COMMIT|^ROLLBACK|^BEGIN|SELECT|INSERT + |UPDATE|DELETE|REPLACE|^SET|UNION|^START|^LOCK|^LOAD}xi; + my @verbs = $query =~ m/\b($verbs_pat)\b/gio; + @verbs = do { + my $last = ''; + grep { my $pass = $_ ne $last; $last = $_; $pass } map { uc } @verbs; + }; + + if ( ($verbs[0] || '') eq 'SELECT' && @verbs > 1 ) { + # False-positive verbs after SELECT + my $union = grep { $_ eq 'UNION' } @verbs; + @verbs = $union ? qw(SELECT UNION) : qw(SELECT); + } + + my %seen; + $verbs = join(q{ }, grep { !$seen{$_}++ } @verbs); + } + + if ( $verbs && $verbs =~ m/^SHOW/ ) { + my %alias_for = qw( + SCHEMA DATABASE + KEYS INDEX + INDEXES INDEX + ); + map { $verbs =~ s/$_/$alias_for{$_}/ } keys %alias_for; + $query = $verbs; + } + else { + my @tables; + $query =~ s/ (?:LOW_PRIORITY|IGNORE|STRAIGHT_JOIN)//ig; + if ( $query =~ /^\s*LOCK\s+TABLES/i ) { + $query =~ s/^(\s*LOCK\s+TABLES\s+)//i; + $query =~ s/\s+(?:READ|WRITE|LOCAL)+\s*//gi; + $query = "FROM $query"; + } + $query =~ s/\\["']//g; # quoted strings + $query =~ s/".*?"/?/sg; # quoted strings + $query =~ s/'.*?'/?/sg; # quoted strings + + foreach my $tbls ( $query =~ m/$tbl_regex/gio ) { + next if $tbls =~ m/\ASELECT\b/i; + foreach my $tbl ( split(',', $tbls) ) { + $tbl =~ s/\s*($tbl_ident)(\s+.*)?/$1/gio; + if ( $tbl !~ m/[a-zA-Z]/ ) { + # Skip suspicious table name + next; + } + push @tables, $tbl; + } + } + + # If we have a bunch of tables like db1.tbl1 db1.tbl2, convert to + # db1.tbl1 -.tbl2 etc. Also remove repeated tables, and strip `quotes`. + $query = $verbs; + my $prev = ''; + foreach my $t ( @tables, $table ) { + next unless $t; + $t =~ s/`//g; + next if $t eq $prev; + my ($prefix, undef) = split(/\./, $prev); + $prev = $t; + if ( $prefix ) { + $t =~ s/^$prefix\./-./; + } + $query .= " " . $t; + } + } + + # die $orig_query if $query eq 'LOCK lock'; + return $query; +} + # secs_to_time {{{3 sub secs_to_time { my ( $secs, $fmt ) = @_; $secs ||= 0; - return '00:00' unless $secs; + + # If the inbound value has a decimal point, then format the seconds with milliseconds. + my $hires = $secs =~ m/\./ ? '%06.3f' : '%02d'; + + if ( !$secs ) { + return sprintf("00:$hires", $secs); + } # Decide what format to use, if not given $fmt ||= $secs >= 86_400 ? 'd' @@ -6253,20 +7217,20 @@ sub secs_to_time { return $fmt eq 'd' ? sprintf( - "%d+%02d:%02d:%02d", + "%d+%02d:%02d:$hires", int($secs / 86_400), int(($secs % 86_400) / 3_600), int(($secs % 3_600) / 60), - $secs % 60) + $secs % 60 + ($secs - int($secs))) : $fmt eq 'h' ? sprintf( - "%02d:%02d:%02d", + "%02d:%02d:$hires", int(($secs % 86_400) / 3_600), int(($secs % 3_600) / 60), - $secs % 60) + $secs % 60 + ($secs - int($secs))) : sprintf( - "%02d:%02d", + "%02d:$hires", int(($secs % 3_600) / 60), - $secs % 60); + $secs % 60 + ($secs - int($secs))); } # dulint_to_int {{{3 @@ -6300,13 +7264,13 @@ sub create_statusbar { else { if ( $modes{$mode}->{server_group} ) { $cxn = "Servers: " . $modes{$mode}->{server_group}; - my $err_count = grep { $dbhs{$_} && $dbhs{$_}->{err_count} } @cxns; + my $err_count = grep { $dbhs{$_} && $dbhs{$_}->{failed} } @cxns; if ( $err_count ) { $cxn .= "(" . ( scalar(@cxns) - $err_count ) . "/" . scalar(@cxns) . ")"; } } else { - $cxn = join(' ', map { ($dbhs{$_}->{err_count} ? '!' : '') . $_ } + $cxn = join(' ', map { ($dbhs{$_}->{failed} ? '!' : '') . $_ } grep { $dbhs{$_} } @cxns); } } @@ -6317,7 +7281,7 @@ sub create_statusbar { my $inc = inc(0, $cxns[0]); # Format server uptime human-readably, calculate QPS... - my $uptime = secs_to_time( $vars->{Uptime_hires} ); + my $uptime = fuzzy_time( $vars->{Uptime_hires} ); my $qps = ($inc->{Questions}||0) / ($inc->{Uptime_hires}||1); my $ibinfo = ''; @@ -6502,6 +7466,18 @@ sub get_connections { if ( $modes{$mode}->{one_connection} ) { @connections = @connections ? $connections[0] : (); } + # If the connections are the same as a server group, we set the mode's + # group to that group. + if ( ! $modes{$mode}->{server_group} ) { + my $maybe_group = join(',', sort @connections); + foreach my $g ( keys %server_groups ) { + my $group_conns = join(',', sort @{$server_groups{$g}}); + if ( $maybe_group eq $group_conns ) { + $modes{$mode}->{server_group} = $g; + last; + } + } + } return unique(@connections); } @@ -6530,7 +7506,7 @@ sub choose_connections { my $choices = prompt_list("Choose connections or a group for $mode mode", undef, sub { return keys %$meta }, $meta); - my @choices = unique(grep { $_ } split(/\s+/, $choices)); + my @choices = unique(grep { $_ } $choices =~ m/(\S+)/g); if ( @choices ) { if ( $choices[0] =~ s/^#// && exists $server_groups{$choices[0]} ) { $modes{$mode}->{server_group} = $choices[0]; @@ -6553,9 +7529,8 @@ sub do_stmt { # Test if the cxn should not even be tried return undef if $dbhs{$cxn} - && $dbhs{$cxn}->{err_count} - && ( !$dbhs{$cxn}->{dbh} || !$dbhs{$cxn}->{dbh}->{Active} || $dbhs{$cxn}->{mode} eq $config{mode}->{val} ) - && $dbhs{$cxn}->{wake_up} > $clock; + && $dbhs{$cxn}->{failed} + && ( !$dbhs{$cxn}->{dbh} || !$dbhs{$cxn}->{dbh}->{Active} || $dbhs{$cxn}->{mode} eq $config{mode}->{val} ); my $sth; my $retries = 1; @@ -6596,13 +7571,12 @@ sub do_stmt { } } -# Keeps track of error count, sleep times till retries, etc etc. -# When there's an error we retry the connection every so often, increasing in -# Fibonacci series to prevent too much banging on the server. +# Marks a connection as failed. When we sleep between redraws, we try to +# reopen. sub handle_cxn_error { my ( $cxn, $err ) = @_; my $meta = $dbhs{$cxn}; - $meta->{err_count}++; + $meta->{failed} = 1; # This is used so errors that have to do with permissions needed by the current # mode will get displayed as long as we're in this mode, but get ignored if the @@ -6616,12 +7590,8 @@ sub handle_cxn_error { } $meta->{last_err} = $err; - my $sleep_time = $meta->{this_sleep} + $meta->{prev_sleep}; - $meta->{prev_sleep} = $meta->{this_sleep}; - $meta->{this_sleep} = $sleep_time; - $meta->{wake_up} = $clock + $sleep_time; if ( $config{show_cxn_errors}->{val} ) { - print STDERR "Error at tick $clock $cxn $err" if $config{debug}->{val}; + print STDERR "DB error: $cxn $err" if $config{debug}->{val}; } } @@ -6634,9 +7604,8 @@ sub do_query { # Test if the cxn should not even be tried return undef if $dbhs{$cxn} - && $dbhs{$cxn}->{err_count} - && ( !$dbhs{$cxn}->{dbh} || !$dbhs{$cxn}->{dbh}->{Active} || $dbhs{$cxn}->{mode} eq $config{mode}->{val} ) - && $dbhs{$cxn}->{wake_up} > $clock; + && $dbhs{$cxn}->{failed} + && ( !$dbhs{$cxn}->{dbh} || !$dbhs{$cxn}->{dbh}->{Active} || $dbhs{$cxn}->{mode} eq $config{mode}->{val} ); my $sth; my $retries = 1; @@ -6679,9 +7648,6 @@ sub connect_to_db { $dbhs{$cxn} ||= { stmts => {}, # bucket for prepared statements. - prev_sleep => 0, - this_sleep => 1, - wake_up => 0, start_time => 0, dbh => undef, }; @@ -6689,8 +7655,7 @@ sub connect_to_db { if ( !$href->{dbh} || ref($href->{dbh}) !~ m/DBI/ || !$href->{dbh}->ping ) { my $dbh = get_new_db_connection($cxn); - @{$href}{qw(dbh err_count wake_up this_sleep start_time prev_sleep)} - = ($dbh, 0, 0, 1, 0, 0); + @{$href}{qw(dbh failed start_time stmts)} = ($dbh, 0, 0, {}); # Derive and store the server's start time in hi-res my $uptime = $dbh->selectrow_hashref("show status like 'Uptime'")->{value}; @@ -6709,7 +7674,7 @@ sub connect_to_db { # Compares versions like 5.0.27 and 4.1.15-standard-log sub version_ge { my ( $dbh, $target ) = @_; - my $version = sprintf('%03d%03d%03d', $dbh->{mysql_serverinfo} =~ m/(\d+)/g); + my $version = sprintf('%03d%03d%03d', $dbh->{mysql_serverinfo} =~ m/^(\d+).(\d+).(\d+)/g); return $version ge sprintf('%03d%03d%03d', $target =~ m/(\d+)/g); } @@ -6781,7 +7746,7 @@ sub get_cxn_errors { return () unless $config{show_cxn_errors_in_tbl}->{val}; return map { [ $_ . ': ' . $dbhs{$_}->{last_err}, 'red' ] } - grep { $dbhs{$_} && $dbhs{$_}->{err_count} && $dbhs{$_}->{mode} eq $config{mode}->{val} } + grep { $dbhs{$_} && $dbhs{$_}->{failed} && $dbhs{$_}->{mode} eq $config{mode}->{val} } @cxns; } @@ -6868,6 +7833,15 @@ sub compile_expr { # This is a subroutine because it's called from a key to quit the program. sub finish { save_config(); + foreach my $cxn ( values %dbhs ) { + eval { + foreach my $sth ( values %{$cxn->{stmts}} ) { + $sth->finish; + } + $cxn->{dbh}->disconnect; + }; + # Ignore eval errors, we just don't care + } ReadMode('normal') unless $opts{n}; print "\n"; exit(0); @@ -6926,7 +7900,7 @@ sub load_config { my ($old_filename, $answer); - if ( $opts{u} or $opts{p} or $opts{h} or $opts{P} ) { + if ( $opts{u} or $opts{p} or $opts{h} or $opts{P} or $opts{S} ) { my @params = $dsn_parser->get_cxn_params(\%opts); # dsn=$params[0] add_new_dsn($opts{h} || 'localhost', $params[0], 'test.innotop_dl', $opts{u} ? 1 : 0, $opts{u}, $opts{p} ? 1 : 0, $opts{p}); @@ -6934,8 +7908,10 @@ sub load_config { if ($opts{c}) { $conf_file = $opts{c}; } - # innotop got upgraded and this is an old config file. - elsif ( -f "$homepath/.innotop" or -f "$homepath/.innotop/innotop.ini" ) { + # If we don't have a new config file but we do have an old one, + # innotop got upgraded and this is an old config file. Convert it, but + # don't overwrite something existing. + elsif ( ! -f $default_home_conf && ( -f "$homepath/.innotop" or -f "$homepath/.innotop/innotop.ini" ) ) { $conf_file = $default_home_conf; if ( -f "$homepath/.innotop") { $old_filename = "$homepath/.innotop"; @@ -7462,7 +8438,8 @@ sub load_config_tbl_meta { foreach my $prop ( keys %col_props ) { if ( !defined($parts{$prop}) ) { - die "Undefined property $prop for column $col in table $tbl"; + # Make it default to whatever's in col_props. + $parts{$prop} = $col_props{$prop}; } # Un-escape escaping @@ -7997,6 +8974,17 @@ sub choose_mode_tables { $modes{$mode}->{cust}->{visible_tables} = 1; } +# set_visible_table {{{3 +sub set_visible_table { + my ( $tbl ) = @_; + my $mode = $config{mode}->{val}; + my @tbls = grep { $_ eq $tbl } @{$modes{$mode}->{tables}}; + if ( @tbls == 1 ) { + $modes{$mode}->{visible_tables} = [ $tbl ]; + $modes{$mode}->{cust}->{visible_tables} = 1; + } +} + # choose_visible_table {{{3 sub choose_visible_table { my ( $grep_cond ) = @_; @@ -8045,7 +9033,7 @@ sub choose_filters { } ); - my @choices = unique(split(/\s+/, $val)); + my @choices = unique($val =~ m/(\S+)/g); foreach my $new ( grep { !exists($filters{$_}) } @choices ) { my $answer = prompt("There is no filter called '$new'. Create it?", undef, 'y'); if ( $answer eq 'y' ) { @@ -8290,7 +9278,7 @@ sub choose_or_create_connection { sub { return @available }, { map { $_ => $connections{$_}->{dsn} } @available }); - my @new = unique(grep { !exists $connections{$_} } split(/\s+/, $new_cxns)); + my @new = unique(grep { !exists $connections{$_} } $new_cxns =~ m/(\S+)/g); foreach my $new ( @new ) { my $answer = prompt("There is no connection called '$new'. Create it?", undef, "y"); if ( $answer eq 'y' ) { @@ -8309,6 +9297,7 @@ sub choose_servers { my @chosen = choose_or_create_connection($cxns, 'for this mode'); $modes{$mode}->{connections} = \@chosen; $modes{$mode}->{server_group} = ''; # Clear this because it overrides {connections} + get_connections(); # This will set the server group if it matches connections just chosen } # display_license {{{3 @@ -8339,10 +9328,41 @@ sub get_status_info { $vars->{Uptime_hires} ||= get_uptime($cxn); $vars->{cxn} = $cxn; - # Add SHOW VARIABLES to the hash - $sth = do_stmt($cxn, 'SHOW_VARIABLES') or next; - $res = $sth->fetchall_arrayref(); - map { $vars->{$_->[0]} = $_->[1] || 0 } @$res; + # Add SHOW VARIABLES to the hash. If we've gotten this info before, skip and re-use. + if ( $show_variables{$cxn} ) { + $res = $show_variables{$cxn}; + } + else { + $sth = do_stmt($cxn, 'SHOW_VARIABLES') or next; + $res = $sth->fetchall_arrayref(); + $res = {map { $_->[0] => $_->[1] || 0 } @$res}; + $show_variables{$cxn} = $res; + } + @{$vars}{keys %$res} = values %$res; + + # Create sparklines for QPS and Threads_running. As a consequence of + # this, we get QPS for free. TODO: remove QPS computation from + # elsewhere. + my $pre = $vars{$cxn}->{$clock - 1}; + if ( $pre && $pre->{Uptime_hires} ) { + my @prev_qps = ($pre->{SPARK_store_qps} || '') =~ m/(\S+)/g; + my @prev_run = ($pre->{SPARK_store_run} || '') =~ m/(\S+)/g; + + # Find out the values; throw away if too many; sparkify; store. + my $this_qps = (($vars->{Questions} || 0) - ($pre->{Questions} || 0))/ + ($vars->{Uptime_hires} - $pre->{Uptime_hires}); + push @prev_qps, $this_qps; + shift @prev_qps if @prev_qps > $config{spark}->{val}; + my $qps_spark = sparkify(@prev_qps); + $vars->{SPARK_qps} = $qps_spark; + $vars->{SPARK_store_qps} = join(' ', @prev_qps); + my $this_run = $vars->{Threads_running}; + push @prev_run, $this_run; + shift @prev_run if @prev_run > $config{spark}->{val}; + my $run_spark = sparkify(@prev_run); + $vars->{SPARK_run} = $run_spark; + $vars->{SPARK_store_run} = join(' ', @prev_run); + } } } } @@ -8352,7 +9372,6 @@ sub get_status_info { sub choose_thread { my ( $grep_cond, $prompt ) = @_; - # Narrow the list to queries that can be explained. my %thread_for = map { # Eliminate innotop's own threads. $_ => $dbhs{$_}->{dbh} ? $dbhs{$_}->{dbh}->{mysql_thread_id} : 0 @@ -8380,7 +9399,7 @@ sub choose_thread { my ( $a, $b ) = @_; return $a->{query} && !$b->{query} ? 1 : $b->{query} && !$a->{query} ? -1 - : ($a->{time} || 0) <=> ($b->{time} || 0); + : ($a->{time} || 0) cmp ($b->{time} || 0); }; my @threads = map { $_->{id} } reverse sort { $sort_func->($a, $b) } @candidates; @@ -8439,7 +9458,7 @@ sub inc { # Numeric variables get subtracted, non-numeric get passed straight through. map { $_ => - ( (defined $cur->{$_} && $cur->{$_} =~ m/$num_regex/) + ( (defined $cur->{$_} && $cur->{$_} =~ m/$num_regex/ && ($pre->{$_} || '') =~ m/$num_regex/ ) ? $cur->{$_} - ($pre->{$_} || 0) : $cur->{$_} ) } keys %{$cur} @@ -8479,6 +9498,72 @@ sub extract_values { return $result; } +# get_processlist_stats {{{3 +# Inserts special values as though they are SHOW STATUS counters. +sub get_processlist_stats { + my @cxns = @_; + @current_queries = (); + if ( !$info_gotten{processlist_stats}++ ) { + foreach my $cxn ( @cxns ) { + my $max_query_time = 0; + my ($user_threads, $slaves, $longest_sql, $slave_sql, $locked); + $vars{$cxn}->{$clock} ||= {}; + my $vars = $vars{$cxn}->{$clock}; + $vars->{cxn} = $cxn; + my $stmt = do_stmt($cxn, 'PROCESSLIST_NO_IS') or next; + my $arr = $stmt->fetchall_arrayref({}); + my $cur = undef; + foreach my $thread ( @$arr ) { + if ( ($thread->{state} || '') =~ m/lock/i ) { + $locked++; + } + # Ignore non-user threads, but remember the SQL in case there is + # no user SQL. Ignore sleeping threads and SHOW PROCESSLIST + # threads. + if ( ($thread->{user} || '') =~ m/system user/ ) { + if ( $thread->{info} && $thread->{time} ) { + $slave_sql = $thread->{info}; + } + next; + } + next unless $thread->{command}; + if ( $thread->{command} eq 'Binlog Dump' ) { + $slaves++; + next; + } + next unless $thread->{command} eq 'Query'; + next unless $thread->{state} && $thread->{info}; + next if $thread->{info} =~ m#/\*innotop#; + $user_threads++; + if ( $thread->{time} > $max_query_time ) { + $max_query_time = $thread->{time}; + $longest_sql = $thread->{info}; + if ( $thread->{state} eq 'Checking table' ) { + $longest_sql = 'CHECK TABLE ' . $thread->{info}; + } + $cur = { + cxn => $cxn, + id => $thread->{id}, + db => $thread->{db}, + query => $thread->{info}, + time => $thread->{time}, + user => $thread->{user}, + host => $thread->{host}, + }; + $thread->{host} =~ s/:.*$//; + } + } + $vars->{Max_query_time} = $max_query_time; + $vars->{User_threads_running} = $user_threads; + $vars->{Slaves} = $slaves || 0; + $vars->{Longest_sql} = $longest_sql || $slave_sql || ''; + $vars->{Locked_count} = $locked || 0; + $vars->{Uptime_hires} ||= get_uptime($cxn); + push @current_queries, $cur if $cur; + } + } +} + # get_full_processlist {{{3 sub get_full_processlist { my @cxns = @_; @@ -8503,6 +9588,54 @@ sub get_open_tables { return @result; } +# get_index_statistics {{{3 +sub get_index_statistics { + my @cxns = @_; + my @result; + foreach my $cxn ( @cxns ) { + my $stmt = do_stmt($cxn, 'INDEX_STATISTICS') or next; + my $arr = $stmt->fetchall_arrayref({}); + push @result, map { $_->{cxn} = $cxn; $_ } @$arr; + } + return @result; +} + +# get_index_table_statistics {{{3 +sub get_index_table_statistics { + my @cxns = @_; + my @result; + foreach my $cxn ( @cxns ) { + my $stmt = do_stmt($cxn, 'INDEX_TABLE_STATISTICS') or next; + my $arr = $stmt->fetchall_arrayref({}); + push @result, map { $_->{cxn} = $cxn; $_ } @$arr; + } + return @result; +} + +# get_table_statistics {{{3 +sub get_table_statistics { + my @cxns = @_; + my @result; + foreach my $cxn ( @cxns ) { + my $stmt = do_stmt($cxn, 'TABLE_STATISTICS') or next; + my $arr = $stmt->fetchall_arrayref({}); + push @result, map { $_->{cxn} = $cxn; $_ } @$arr; + } + return @result; +} + +# get_innodb_blocked_blocker {{{3 +sub get_innodb_blocked_blocker { + my @cxns = @_; + my @result; + foreach my $cxn ( @cxns ) { + my $stmt = do_stmt($cxn, 'INNODB_BLOCKED_BLOCKER') or next; + my $arr = $stmt->fetchall_arrayref({}); + push @result, map { $_->{cxn} = $cxn; $_ } @$arr; + } + return @result; +} + # get_innodb_status {{{3 sub get_innodb_status { my ( $cxns, $addl_sections ) = @_; @@ -8549,6 +9682,7 @@ sub get_innodb_status { } else { + next if ($show_variables{$cxn}->{have_innodb} || 'YES') eq 'NO'; my $stmt = do_stmt($cxn, 'INNODB_STATUS') or next; $innodb_status_text = $stmt->fetchrow_hashref()->{status}; } @@ -8563,6 +9697,7 @@ sub get_innodb_status { $config{debug}->{val}, \%sections_required, 0, # don't parse full lock information + $show_variables{$cxn}->{version} ) ); if ( !$innodb_status{IB_got_all} && $config{auto_wipe_dl}->{val} ) { @@ -8587,6 +9722,9 @@ sub clear_deadlock { return unless $tbl; eval { + # disable binary logging for the session + do_query($cxn, "set SQL_LOG_BIN=0"); + # Set up the table for creating a deadlock. my $engine = version_ge($dbhs{$cxn}->{dbh}, '4.1.2') ? 'engine' : 'type'; return unless do_query($cxn, "drop table if exists $tbl"); @@ -8616,6 +9754,11 @@ sub clear_deadlock { # Clean up. do_query($cxn, "drop table $tbl"); + + # enable binary logging for the session again + # the session by itself will not be used anymore, but this is clean :) + do_query($cxn, "set SQL_LOG_BIN=1"); + }; if ( $EVAL_ERROR ) { print $EVAL_ERROR; @@ -8638,6 +9781,7 @@ sub get_master_logs { } # get_master_slave_status {{{3 +# Inserts special counters as though they are SHOW STATUS counters. sub get_master_slave_status { my @cxns = @_; if ( !$info_gotten{replication_status}++ ) { @@ -8645,18 +9789,61 @@ sub get_master_slave_status { $vars{$cxn}->{$clock} ||= {}; my $vars = $vars{$cxn}->{$clock}; $vars->{cxn} = $cxn; + $vars->{Uptime_hires} ||= get_uptime($cxn); my $stmt = do_stmt($cxn, 'SHOW_MASTER_STATUS') or next; my $res = $stmt->fetchall_arrayref({})->[0]; @{$vars}{ keys %$res } = values %$res; - $stmt = do_stmt($cxn, 'SHOW_SLAVE_STATUS') or next; - $res = $stmt->fetchall_arrayref({})->[0]; - @{$vars}{ keys %$res } = values %$res; - $vars->{Uptime_hires} ||= get_uptime($cxn); + } } } +# get_slave_status {{{3 +# Separated handling of slave status to support 5.7 and replication channels +sub get_slave_status { + my ($cxn, $channel) = @_; + my $chcxn = $channel . '=' . $cxn; + $vars{$chcxn}->{$clock} ||= {}; + my $vars = $vars{$chcxn}->{$clock}; + $vars->{chcxn} = $chcxn; + $vars->{Uptime_hires} ||= get_uptime($chcxn); + + if ( $channel =~ /no_channels/ ) { + my $stmt = do_stmt($cxn, 'SHOW_SLAVE_STATUS') or next; + my $res = $stmt->fetchall_arrayref({}); + if ( $res && @$res ) { + $res = $res->[0]; + @{$vars}{ keys %$res } = values %$res; + $vars->{Slave_ok} = + (($res->{slave_sql_running} || 'Yes') eq 'Yes' + && ($res->{slave_io_running} || 'Yes') eq 'Yes') ? 'Yes' : 'No'; + } + else { + $vars->{Slave_ok} = 'Off'; + } + } else { + my $dbh = connect_to_db($cxn); + my $sql = 'SHOW SLAVE STATUS FOR CHANNEL \'' . $channel . '\''; + my $stmt = $dbh->prepare($sql ) ; + $stmt->execute(); + my $res = $stmt->fetchall_arrayref({}); + if ( $res && @$res ) { + $res = $res->[0]; + @{$vars}{ keys %$res } = values %$res; + $vars->{Slave_ok} = + (($res->{slave_sql_running} || 'Yes') eq 'Yes' + && ($res->{slave_io_running} || 'Yes') eq 'Yes') ? 'Yes' : 'No'; + } + else { + $vars->{Slave_ok} = 'Off'; + } + } + } + + + + sub is_func { my ( $word ) = @_; return defined(&$word) @@ -8811,6 +9998,12 @@ Port to use for connection. Don't read the central configuration file. +=item --timestamp + +In -n mode, write a timestamp either before every screenful of output, or if +the option is given twice, at the start of every line. The format is controlled +by the timeformat config variable. + =item --user User to use for connection. @@ -8860,6 +10053,13 @@ following list: =over +=item A: Health Dashboard + +This mode displays a single table with one row per monitored server. The +columns show essential overview information about the server's health, and +coloration rules show whether replication is running or if there are any very +long-running queries or excessive replication delay. + =item B: InnoDB Buffers This mode displays information about the InnoDB buffer pool, page statistics, @@ -8945,6 +10145,12 @@ This mode shows InnoDB's I/O statistics, including the I/O threads, pending I/O, file I/O miscellaneous, and log statistics. It displays the L<"io_threads">, L<"pending_io">, L<"file_io_misc">, and L<"log_statistics"> tables by default. +=item K: InnoDB Lock Waits + +This mode shows information from InnoDB plugin's transaction and locking tables. +You can use it to find when a transaction is waiting for another, and kill the +blocking transaction. It displays the L<"innodb_blocked_blocker>" table. + =item L: Locks This mode shows information about current locks. At the moment only InnoDB @@ -9008,6 +10214,23 @@ tables might be locked implicitly. This mode displays the L<"open_tables"> mode by default. +=item U: User Statistics + +This mode displays data that's available in Percona's enhanced version of MySQL +(also known as Percona Server with XtraDB). Specifically, it makes it easy to +enable and disable the so-called "user statistics." This feature gathers stats +on clients, threads, users, tables, and indexes and makes them available as +INFORMATION_SCHEMA tables. These are invaluable for understanding what your +server is doing. They are also available in MariaDB. + +The statistics supported so far are only from the TABLE_STATISTICS and +INDEX_STATISTICS tables added by Percona. There are three views: one of table stats, +one of index stats (which can be aggregated with the = key), and one of both. + +The server doesn't gather these stats by default. You have to set the variable +userstat_running to turn it on. You can do this easily with innotop from U mode, +with the 's' key. + =item Q: Query List This mode displays the output from SHOW FULL PROCESSLIST, much like B<mytop>'s @@ -9156,6 +10379,9 @@ connection names of that master's slaves (there is no way for innotop to determine this reliably itself). innotop will find the minimum binlog in use by these slave connections and suggest it as the argument to PURGE MASTER LOGS. +in L<"U: User Statistics"> mode, you can use the 's' key to start and stop +the collection of the statistics data for TABLE_STATISTICS and similar. + =head1 SERVER CONNECTIONS When you create a server connection using '@', innotop asks you for a series of @@ -9603,6 +10829,11 @@ Disables fetching SHOW INNODB STATUS, in case your server(s) do not have InnoDB enabled and you don't want innotop to try to fetch it. This can also be useful when you don't have the SUPER privilege, required to run SHOW INNODB STATUS. +=item spark + +Specifies how wide a spark chart is. There are two ASCII spark charts in A +mode, showing QPS and User_threads_running. + =item status_inc Whether to show absolute or incremental values for status variables. @@ -9611,6 +10842,11 @@ for that variable. This is a global setting, but will probably become mode-specific at some point. Right now it is honored a bit inconsistently; some modes don't pay attention to it. +=item timeformat + +The C-style strftime()-compatible format for the timestamp line to be printed +in -n mode when -t is set. + =back =item plugins @@ -9874,6 +11110,27 @@ L<"STATUS_VARIABLES">. Displays various data about InnoDB's last foreign key error. Data source: L<"STATUS_VARIABLES">. +=item health_dashboard + +Displays an overall summary of servers, one server per line, for monitoring. +Data source: L<"STATUS_VARIABLES">, L<"MASTER_SLAVE">, L<"PROCESSLIST_STATS">. + +=item index_statistics + +Displays data from the INDEX_STATISTICS table in Percona-enhanced servers. + +=item index_table_statistics + +Displays data from the INDEX_STATISTICS and TABLE_STATISTICS tables in +Percona-enhanced servers. It joins the two together, grouped by the database +and table name. It is the default view in L<"U: User Statistics"> mode, +and makes it easy to see what tables are hot, how many rows are read from indexes, +how many changes are made, and how many changes are made to indexes. + +=item innodb_blocked_blocker + +Displays InnoDB locks and lock waits. Data source: L<"INNODB_BLOCKED_BLOCKER">. + =item innodb_locks Displays InnoDB locks. Data source: L<"INNODB_LOCKS">. @@ -9944,6 +11201,10 @@ L<"STATUS_VARIABLES">. Displays data about the slave SQL thread. Data source: L<"STATUS_VARIABLES">. +=item table_statistics + +Displays data from the TABLE_STATISTICS table in Percona-enhanced servers. + =item t_header Displays various InnoDB status values. Data source: L<"STATUS_VARIABLES">. @@ -10021,6 +11282,10 @@ the table. Several columns are set this way, such as the count column on L<"processlist"> and L<"innodb_transactions">, so you don't see a count when the grouping isn't enabled, but you do when it is. +=item * + +agghide: the reverse of aggonly. The column is hidden when grouping is enabled. + =back =head2 FILTERS @@ -10072,11 +11337,26 @@ persist when you restart innotop. To create a quick-filter, press the '/' key. innotop will prompt you for the column name and filter text. Again, you can use auto-completion on column names. The filter text can be just the text you want to "search for." For example, to filter the L<"processlist"> table on queries -that refer to the products table, type '/' and then 'info product'. +that refer to the products table, type '/' and then 'info product'. Internally, +the filter is compiled into a subroutine like this: + + sub filter { + my ( $set ) = @_; + $set->{info} =~ m/product/; + } The filter text can actually be any Perl regular expression, but of course a literal string like 'product' works fine as a regular expression. +What if you want the filter to discard matching rows, rather than showing +matching rows? If you're familiar with Perl regular expressions, you might +guess how to do this. You have to use a zero-width negative lookahead +assertion. If you don't know what that means, don't worry. Let's filter out +all rows where the command is Gandalf. Type the following: + + 1. / + 2. cmd ^(?!Gandalf) + Behind the scenes innotop compiles the quick-filter into a specially tagged filter that is otherwise like any other filter. It just isn't saved to the configuration file. @@ -10174,8 +11454,8 @@ That's actually quite a worrisome picture. You've got a lot of idle connections (Sleep), and some connections executing queries (Query and Sending Data). That's okay, but you also have a lot in Statistics status, collectively spending over a minute. That means the query optimizer is having a really hard time -optimizing your statements. Something is wrong; it should normally take -milliseconds to optimize queries. You might not have seen this pattern if you +generating execution plans for your statements. Something is wrong; it should +normally take milliseconds to plan queries. You might not have seen this pattern if you didn't look at your connections in aggregate. (This is a made-up example, but it can happen in real life). @@ -10311,12 +11591,20 @@ are defined: Adds commas to large numbers every three decimal places. +=item distill + +Distills SQL into verb-noun-noun format for quick comprehension. + =item dulint_to_int Accepts two unsigned integers and converts them into a single longlong. This is useful for certain operations with InnoDB, which uses two integers as transaction identifiers, for example. +=item fuzzy_time + +Converts a number of seconds into a friendly, readable value like "1h35m". + =item no_ctrl_char Removes quoted control characters from the value. This is affected by the @@ -10365,7 +11653,7 @@ show you something like this: pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo total_mem_alloc Memory Total memory allocate IB_bp_total_m - add_pool_alloc Add'l Pool Additional pool alloca IB_bp_add_poo + add_pool_alloc Add'l Pool Additonal pool alloca IB_bp_add_poo The first line shows which table you're editing, and reminds you again to press '?' for a list of key mappings. The rest is a tabular representation of the @@ -10485,9 +11773,9 @@ or modify its existing functionality, and add new functionality. innotop's plugin functionality is event-based: plugins register themselves to be called when events happen. They then have a chance to influence the event. -An innotop plugin is a Perl module placed in innotop's L<"plugin_dir"> +An innotop plugin is a Perl module (.pm) file placed in innotop's L<"plugin_dir"> directory. On UNIX systems, you can place a symbolic link to the module instead -of putting the actual file there. innotop automatically discovers the file. If +of putting the actual file there. innotop automatically discovers files named C<*.pm>. If there is a corresponding entry in the L<"plugins"> configuration file section, innotop loads and activates the plugin. @@ -10500,7 +11788,7 @@ file and determine the package name and description. innotop inspects the plugin module's source to determine the Perl package name. It looks for a line of the form "package Foo;" and if found, considers the plugin's package name to be Foo. Of course the package name can be a valid Perl -package name, with double semicolons and so on. +package name such as Foo::Bar, with double colons (::) and so on. It also looks for a description in the source code, to make the plugin editor more human-friendly. The description is a comment line of the form "# @@ -10642,7 +11930,9 @@ $lines is an arrayref of strings. The easiest way to explain the plugin functionality is probably with a simple example. The following module adds a column to the beginning of every table and -sets its value to 1. +sets its value to 1. (If you copy and paste this example code, be sure to remove +the first space from each line; lines such as '# description' must not start with +whitespace). use strict; use warnings FATAL => 'all'; @@ -10716,6 +12006,7 @@ executes "SHOW ENGINE INNODB STATUS", while on earlier versions it executes Statement SQL executed =================== =============================== + INDEX_STATISTICS SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS INNODB_STATUS SHOW [ENGINE] INNODB STATUS KILL_CONNECTION KILL KILL_QUERY KILL QUERY @@ -10726,6 +12017,7 @@ executes "SHOW ENGINE INNODB STATUS", while on earlier versions it executes SHOW_SLAVE_STATUS SHOW SLAVE STATUS SHOW_STATUS SHOW [GLOBAL] STATUS SHOW_VARIABLES SHOW [GLOBAL] VARIABLES + TABLE_STATISTICS SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS =head1 DATA SOURCES @@ -10766,6 +12058,11 @@ section of SHOW INNODB STATUS. It is nested one level deep. This data is from the result set returned by EXPLAIN. +=item INNODB_BLOCKED_BLOCKER + +This data is from the INFORMATION_SCHEMA tables related to InnoDB locks and +the processlist. + =item INNODB_TRANSACTIONS This data is from the TRANSACTIONS section of SHOW INNODB STATUS. @@ -10780,6 +12077,10 @@ STATUS. This data is from the TRANSACTIONS section of SHOW INNODB STATUS and is nested two levels deep. +=item MASTER_SLAVE + +This data is from the combination of SHOW MASTER STATUS and SHOW SLAVE STATUS. + =item OPEN_TABLES This data is from SHOW OPEN TABLES. @@ -10788,6 +12089,12 @@ This data is from SHOW OPEN TABLES. This data is from SHOW FULL PROCESSLIST. +=item PROCESSLIST_STATS + +This data is from SHOW FULL PROCESSLIST and computes stats such as the maximum time +a user query has been running, and how many user queries are running. A "user +query" excludes replication threads. + =item OS_WAIT_ARRAY This data is from the SEMAPHORES section of SHOW INNODB STATUS and is nested one @@ -10874,6 +12181,7 @@ displays it. The following people and organizations are acknowledged for various reasons. Hopefully no one has been forgotten. +Aaron Racine, Allen K. Smith, Aurimas Mikalauskas, Bartosz Fenski, @@ -10925,8 +12233,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, MA 02111-1301 USA. Execute innotop and press '!' to see this information at any time. @@ -10937,7 +12245,7 @@ Originally written by Baron Schwartz; currently maintained by Aaron Racine. =head1 BUGS You can report bugs, ask for improvements, and get other help and support at -L<http://code.google.com/p/innotop/>. There are mailing lists, a source code +L<https://github.com/innotop/innotop>. There are mailing lists, a source code browser, a bug tracker, etc. Please use these instead of contacting the maintainer or author directly, as it makes our job easier and benefits others if the discussions are permanent and public. Of course, if you need to contact us in diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1 index fbb481f9b94..86652945109 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "INNOTOP 1" -.TH INNOTOP 1 "2009-03-09" "perl v5.10.0" "User Contributed Perl Documentation" +.TH INNOTOP 1 "2017-01-23" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -210,7 +219,7 @@ To quit innotop, press the 'q' key. .IX Header "OPTIONS" innotop is mostly configured via its configuration file, but some of the configuration options can come from the command line. You can also specify a -file to monitor for InnoDB status output; see \*(L"\s-1MONITORING\s0 A \s-1FILE\s0\*(R" for more +file to monitor for InnoDB status output; see \*(L"\s-1MONITORING A FILE\*(R"\s0 for more details. .PP You can negate some options by prefixing the option name with \-\-no. For @@ -249,7 +258,7 @@ Specifies the mode in which innotop should start. Corresponds to the configuration option \*(L"mode\*(R". .IP "\-\-nonint" 4 .IX Item "--nonint" -Enable non-interactive operation. See \*(L"NON-INTERACTIVE \s-1OPERATION\s0\*(R" for more. +Enable non-interactive operation. See \*(L"NON-INTERACTIVE \s-1OPERATION\*(R"\s0 for more. .IP "\-\-password" 4 .IX Item "--password" Password to use for connection. @@ -259,6 +268,11 @@ Port to use for connection. .IP "\-\-skipcentral" 4 .IX Item "--skipcentral" Don't read the central configuration file. +.IP "\-\-timestamp" 4 +.IX Item "--timestamp" +In \-n mode, write a timestamp either before every screenful of output, or if +the option is given twice, at the start of every line. The format is controlled +by the timeformat config variable. .IP "\-\-user" 4 .IX Item "--user" User to use for connection. @@ -289,10 +303,16 @@ the servers you're monitoring. You switch between modes with uppercase keys. The following is a brief description of each mode, in alphabetical order. To switch to the mode, press the key listed in front of its heading in the following list: +.IP "A: Health Dashboard" 4 +.IX Item "A: Health Dashboard" +This mode displays a single table with one row per monitored server. The +columns show essential overview information about the server's health, and +coloration rules show whether replication is running or if there are any very +long-running queries or excessive replication delay. .IP "B: InnoDB Buffers" 4 .IX Item "B: InnoDB Buffers" This mode displays information about the InnoDB buffer pool, page statistics, -insert buffer, and adaptive hash index. The data comes from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. +insert buffer, and adaptive hash index. The data comes from \s-1SHOW INNODB STATUS.\s0 .Sp This mode contains the \*(L"buffer_pool\*(R", \*(L"page_statistics\*(R", \&\*(L"insert_buffers\*(R", and \*(L"adaptive_hash_index\*(R" tables by default. @@ -313,7 +333,7 @@ This mode is similar to mytop's Command Summary mode. It shows the .Ve .Sp The command summary table is built by extracting variables from -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". The variables must be numeric and must match the prefix +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. The variables must be numeric and must match the prefix given by the \*(L"cmd_filter\*(R" configuration variable. The variables are then sorted by value descending and compared to the last variable, as shown above. The percentage columns are percentage of the total of all variables in the @@ -322,7 +342,7 @@ table, so you can see the relative weight of the variables. The example shows what you see if the prefix is \*(L"Select_\*(R". The default prefix is \*(L"Com_\*(R". You can choose a prefix with the 's' key. .Sp -It's rather like running \s-1SHOW\s0 \s-1VARIABLES\s0 \s-1LIKE\s0 \*(L"prefix%\*(R" with memory and +It's rather like running \s-1SHOW VARIABLES LIKE \s0\*(L"prefix%\*(R" with memory and nice formatting. .Sp Values are aggregated across all servers. The Pct columns are not correctly @@ -335,10 +355,10 @@ table shows the locks each transaction held and waited for. A deadlock is caused by a cycle in the waits-for graph, so there should be two locks held and one waited for unless the deadlock information is truncated. .Sp -InnoDB puts deadlock information before some other information in the \s-1SHOW\s0 -\&\s-1INNODB\s0 \s-1STATUS\s0 output. If there are a lot of locks, the deadlock information can -grow very large, and there is a limit on the size of the \s-1SHOW\s0 \s-1INNODB\s0 -\&\s-1STATUS\s0 output. A large deadlock can fill the entire output, or even be +InnoDB puts deadlock information before some other information in the \s-1SHOW +INNODB STATUS\s0 output. If there are a lot of locks, the deadlock information can +grow very large, and there is a limit on the size of the \s-1SHOW INNODB +STATUS\s0 output. A large deadlock can fill the entire output, or even be truncated, and prevent you from seeing other information at all. If you are running innotop in another mode, for example T mode, and suddenly you don't see anything, you might want to check and see if a deadlock has wiped out the data @@ -346,8 +366,8 @@ you need. .Sp If it has, you can create a small deadlock to replace the large one. Use the \&'w' key to 'wipe' the large deadlock with a small one. This will not work -unless you have defined a deadlock table for the connection (see \*(L"\s-1SERVER\s0 -\&\s-1CONNECTIONS\s0\*(R"). +unless you have defined a deadlock table for the connection (see \*(L"\s-1SERVER +CONNECTIONS\*(R"\s0). .Sp You can also configure innotop to automatically detect when a large deadlock needs to be replaced with a small one (see \*(L"auto_wipe_dl\*(R"). @@ -371,6 +391,11 @@ This mode displays the \*(L"fk_error\*(R" table by default. This mode shows InnoDB's I/O statistics, including the I/O threads, pending I/O, file I/O miscellaneous, and log statistics. It displays the \*(L"io_threads\*(R", \&\*(L"pending_io\*(R", \*(L"file_io_misc\*(R", and \*(L"log_statistics\*(R" tables by default. +.IP "K: InnoDB Lock Waits" 4 +.IX Item "K: InnoDB Lock Waits" +This mode shows information from InnoDB plugin's transaction and locking tables. +You can use it to find when a transaction is waiting for another, and kill the +blocking transaction. It displays the "innodb_blocked_blocker" table. .IP "L: Locks" 4 .IX Item "L: Locks" This mode shows information about current locks. At the moment only InnoDB @@ -384,7 +409,7 @@ You can configure MySQL and innotop to monitor not only locks for which a transaction is waiting, but those currently held, too. You can do this with the InnoDB Lock Monitor (<http://dev.mysql.com/doc/en/innodb\-monitor.html>). It's not documented in the MySQL manual, but creating the lock monitor with the -following statement also affects the output of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, which innotop +following statement also affects the output of \s-1SHOW INNODB STATUS,\s0 which innotop uses: .Sp .Vb 1 @@ -392,7 +417,7 @@ uses: .Ve .Sp This causes InnoDB to print its output to the MySQL file every 16 seconds or so, -as stated in the manual, but it also makes the normal \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 output +as stated in the manual, but it also makes the normal \s-1SHOW INNODB STATUS\s0 output include lock information, which innotop can parse and display (that's the undocumented feature). .Sp @@ -414,13 +439,13 @@ the screen when one connection is waiting for locks another connection holds: \& localhost 11 RECORD 0 00:00 00:25 X test t1 PRIMARY .Ve .Sp -You can see the first connection, \s-1ID\s0 12, is waiting for a lock on the \s-1PRIMARY\s0 +You can see the first connection, \s-1ID 12,\s0 is waiting for a lock on the \s-1PRIMARY\s0 key on test.t1, and has been waiting for 10 seconds. The second connection isn't waiting, because the Waiting column is 0, but it holds locks on the same index. That tells you connection 11 is blocking connection 12. .IP "M: Master/Slave Replication Status" 4 .IX Item "M: Master/Slave Replication Status" -This mode shows the output of \s-1SHOW\s0 \s-1SLAVE\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1MASTER\s0 \s-1STATUS\s0 in three +This mode shows the output of \s-1SHOW SLAVE STATUS\s0 and \s-1SHOW MASTER STATUS\s0 in three tables. The first two divide the slave's status into \s-1SQL\s0 and I/O thread status, and the last shows master status. Filters are applied to eliminate non-slave servers from the slave tables, and non-master servers from the master table. @@ -429,15 +454,31 @@ This mode displays the \*(L"slave_sql_status\*(R", \*(L"slave_io_status\*(R", an \&\*(L"master_status\*(R" tables by default. .IP "O: Open Tables" 4 .IX Item "O: Open Tables" -This section comes from MySQL's \s-1SHOW\s0 \s-1OPEN\s0 \s-1TABLES\s0 command. By default it is +This section comes from MySQL's \s-1SHOW OPEN TABLES\s0 command. By default it is filtered to show tables which are in use by one or more queries, so you can get a quick look at which tables are 'hot'. You can use this to guess which tables might be locked implicitly. .Sp This mode displays the \*(L"open_tables\*(R" mode by default. +.IP "U: User Statistics" 4 +.IX Item "U: User Statistics" +This mode displays data that's available in Percona's enhanced version of MySQL +(also known as Percona Server with XtraDB). Specifically, it makes it easy to +enable and disable the so-called \*(L"user statistics.\*(R" This feature gathers stats +on clients, threads, users, tables, and indexes and makes them available as +\&\s-1INFORMATION_SCHEMA\s0 tables. These are invaluable for understanding what your +server is doing. They are also available in MariaDB. +.Sp +The statistics supported so far are only from the \s-1TABLE_STATISTICS\s0 and +\&\s-1INDEX_STATISTICS\s0 tables added by Percona. There are three views: one of table stats, +one of index stats (which can be aggregated with the = key), and one of both. +.Sp +The server doesn't gather these stats by default. You have to set the variable +userstat_running to turn it on. You can do this easily with innotop from U mode, +with the 's' key. .IP "Q: Query List" 4 .IX Item "Q: Query List" -This mode displays the output from \s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0, much like \fBmytop\fR's +This mode displays the output from \s-1SHOW FULL PROCESSLIST,\s0 much like \fBmytop\fR's query list mode. This mode does \fBnot\fR show InnoDB-related information. This is probably one of the most useful modes for general usage. .Sp @@ -447,8 +488,8 @@ innotop hides inactive processes and its own process. You can toggle these on and off with the 'i' and 'a' keys. .Sp You can \s-1EXPLAIN\s0 a query from this mode with the 'e' key. This displays the -query's full text, the results of \s-1EXPLAIN\s0, and in newer MySQL versions, even -the optimized query resulting from \s-1EXPLAIN\s0 \s-1EXTENDED\s0. innotop also tries to +query's full text, the results of \s-1EXPLAIN,\s0 and in newer MySQL versions, even +the optimized query resulting from \s-1EXPLAIN EXTENDED. \s0 innotop also tries to rewrite certain queries to make them EXPLAIN-able. For example, \s-1INSERT/SELECT\s0 statements are rewritable. .Sp @@ -503,7 +544,7 @@ depends on the mode you're in, and what servers you're monitoring. The first few words are always [\s-1RO\s0] (if readonly is set to 1), the innotop mode, such as \&\*(L"InnoDB Txns\*(R" for T mode, followed by a reminder to press '?' for help at any time. -.SS "\s-1ONE\s0 \s-1SERVER\s0" +.SS "\s-1ONE SERVER\s0" .IX Subsection "ONE SERVER" The simplest case is when you're monitoring a single server. In this case, the name of the connection is next on the status line. This is the name you gave @@ -511,9 +552,9 @@ when you created the connection \*(-- most likely the MySQL server's hostname. This is followed by the server's uptime. .PP If you're in an InnoDB mode, such as T or B, the next word is \*(L"InnoDB\*(R" followed -by some information about the \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 output used to render the -screen. The first word is the number of seconds since the last \s-1SHOW\s0 \s-1INNODB\s0 -\&\s-1STATUS\s0, which InnoDB uses to calculate some per-second statistics. The next is +by some information about the \s-1SHOW INNODB STATUS\s0 output used to render the +screen. The first word is the number of seconds since the last \s-1SHOW INNODB +STATUS,\s0 which InnoDB uses to calculate some per-second statistics. The next is a smiley face indicating whether the InnoDB output is truncated. If the smiley face is a :\-), all is well; there is no truncation. A :^| means the transaction list is so long, InnoDB has only printed out some of the transactions. Finally, @@ -523,21 +564,21 @@ printing too much lock information (see \*(L"D: InnoDB Deadlocks\*(R"). The next two words indicate the server's queries per second (\s-1QPS\s0) and how many threads (connections) exist. Finally, the server's version number is the last thing on the line. -.SS "\s-1MULTIPLE\s0 \s-1SERVERS\s0" +.SS "\s-1MULTIPLE SERVERS\s0" .IX Subsection "MULTIPLE SERVERS" -If you are monitoring multiple servers (see \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R"), the status +If you are monitoring multiple servers (see \*(L"\s-1SERVER CONNECTIONS\*(R"\s0), the status line does not show any details about individual servers. Instead, it shows the names of the connections that are active. Again, these are connection names you specified, which are likely to be the server's hostname. A connection that has an error is prefixed with an exclamation point. .PP -If you are monitoring a group of servers (see \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R"), the status +If you are monitoring a group of servers (see \*(L"\s-1SERVER GROUPS\*(R"\s0), the status line shows the name of the group. If any connection in the group has an error, the group's name is followed by the fraction of the connections that don't have errors. .PP -See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R" for more details about innotop's error handling. -.SS "\s-1MONITORING\s0 A \s-1FILE\s0" +See \*(L"\s-1ERROR HANDLING\*(R"\s0 for more details about innotop's error handling. +.SS "\s-1MONITORING A FILE\s0" .IX Subsection "MONITORING A FILE" If you give a filename on the command line, innotop will not connect to \s-1ANY\s0 servers at all. It will watch the specified file for InnoDB status output and @@ -553,7 +594,7 @@ commands are killing queries and stopping or starting slaves. .PP You can kill a connection, or in newer versions of MySQL kill a query but not a connection, from \*(L"Q: Query List\*(R" and \*(L"T: InnoDB Transactions\*(R" modes. -Press 'k' to issue a \s-1KILL\s0 command, or 'x' to issue a \s-1KILL\s0 \s-1QUERY\s0 command. +Press 'k' to issue a \s-1KILL\s0 command, or 'x' to issue a \s-1KILL QUERY\s0 command. innotop will prompt you for the server and/or connection \s-1ID\s0 to kill (innotop does not prompt you if there is only one possible choice for any input). innotop pre-selects the longest-running query, or the oldest connection. @@ -561,17 +602,20 @@ Confirm the command with 'y'. .PP In \*(L"Slave Replication Status\*(R"\*(L" in \*(R"M: Master mode, you can start and stop slaves with the 'a' and 'o' keys, respectively. You can send these commands to many -slaves at once. innotop fills in a default command of \s-1START\s0 \s-1SLAVE\s0 or \s-1STOP\s0 \s-1SLAVE\s0 +slaves at once. innotop fills in a default command of \s-1START SLAVE\s0 or \s-1STOP SLAVE\s0 for you, but you can actually edit the command and send anything you wish, such -as \s-1SET\s0 \s-1GLOBAL\s0 SQL_SLAVE_SKIP_COUNTER=1 to make the slave skip one binlog event +as \s-1SET GLOBAL\s0 SQL_SLAVE_SKIP_COUNTER=1 to make the slave skip one binlog event when it starts. .PP You can also ask innotop to calculate the earliest binlog in use by any slave -and issue a \s-1PURGE\s0 \s-1MASTER\s0 \s-1LOGS\s0 on the master. Use the 'b' key for this. innotop +and issue a \s-1PURGE MASTER LOGS\s0 on the master. Use the 'b' key for this. innotop will prompt you for a master to run the command on, then prompt you for the connection names of that master's slaves (there is no way for innotop to determine this reliably itself). innotop will find the minimum binlog in use by -these slave connections and suggest it as the argument to \s-1PURGE\s0 \s-1MASTER\s0 \s-1LOGS\s0. +these slave connections and suggest it as the argument to \s-1PURGE MASTER LOGS.\s0 +.PP +in \*(L"U: User Statistics\*(R" mode, you can use the 's' key to start and stop +the collection of the statistics data for \s-1TABLE_STATISTICS\s0 and similar. .SH "SERVER CONNECTIONS" .IX Header "SERVER CONNECTIONS" When you create a server connection using '@', innotop asks you for a series of @@ -587,7 +631,7 @@ module for connecting to a server. It is usually of the form .Sp Since this \s-1DSN\s0 is passed to the DBD::mysql driver, you should read the driver's documentation at \*(L"/search.cpan.org/dist/DBD\-mysql/lib/DBD/mysql.pm\*(R"\*(L" in \*(R"http: for -the exact details on all the options you can pass the driver in the \s-1DSN\s0. You +the exact details on all the options you can pass the driver in the \s-1DSN. \s0 You can read more about \s-1DBI\s0 at <http://dbi.perl.org/docs/>, and especially at <http://search.cpan.org/~timb/DBI/DBI.pm>. .Sp @@ -620,7 +664,7 @@ not encrypted in any way. Once you finish answering these questions, you should be connected to a server. But innotop isn't limited to monitoring a single server; you can define many server connections and switch between them by pressing the '@' key. See -\&\*(L"\s-1SWITCHING\s0 \s-1BETWEEN\s0 \s-1CONNECTIONS\s0\*(R". +\&\*(L"\s-1SWITCHING BETWEEN CONNECTIONS\*(R"\s0. .SH "SERVER GROUPS" .IX Header "SERVER GROUPS" If you have multiple MySQL instances, you can put them into named groups, such @@ -640,7 +684,7 @@ want to use. This setting is per-mode, so you can monitor different connections in each mode, and innotop remembers which connections you choose. .PP You can quickly switch to the 'next' connection in alphabetical order with the -\&'n' key. If you're monitoring a server group (see \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R") this will +\&'n' key. If you're monitoring a server group (see \*(L"\s-1SERVER GROUPS\*(R"\s0) this will switch to the first connection. .PP You can also type many connection names, and innotop will fetch and display data @@ -658,7 +702,7 @@ monitoring a large group or many connections, you may notice increased delay between ticks. .PP When you monitor more than one connection, innotop's status bar changes. See -\&\*(L"\s-1INNOTOP\s0 \s-1STATUS\s0\*(R". +\&\*(L"\s-1INNOTOP STATUS\*(R"\s0. .SH "ERROR HANDLING" .IX Header "ERROR HANDLING" Error handling is not that important when monitoring a single connection, but is @@ -711,7 +755,7 @@ tick, so innotop may appear to hang. .IP "\(bu" 4 innotop only displays the first table in each mode. This is so the output can be easily processed with other command-line utilities such as awk and sed. To -change which tables display in each mode, see \*(L"\s-1TABLES\s0\*(R". Since \*(L"Q: Query +change which tables display in each mode, see \*(L"\s-1TABLES\*(R"\s0. Since \*(L"Q: Query List\*(R" mode is so important, innotop automatically disables the \*(L"q_header\*(R" table. This ensures you'll see the \*(L"processlist\*(R" table, even if you have innotop configured to show the q_header table during interactive operation. @@ -730,7 +774,7 @@ output. innotop does not honor the \*(L"shorten\*(R" transformation, which normally shortens some numbers to human-readable formats. .IP "\(bu" 4 -innotop does not print a status line (see \*(L"\s-1INNOTOP\s0 \s-1STATUS\s0\*(R"). +innotop does not print a status line (see \*(L"\s-1INNOTOP STATUS\*(R"\s0). .SH "CONFIGURING" .IX Header "CONFIGURING" Nearly everything about innotop is configurable. Most things are possible to @@ -741,17 +785,17 @@ dialog. Press another key to select the type of data you want to edit: .IP "S: Statement Sleep Times" 4 .IX Item "S: Statement Sleep Times" Edits \s-1SQL\s0 statement sleep delays, which make innotop pause for the specified -amount of time after executing a statement. See \*(L"\s-1SQL\s0 \s-1STATEMENTS\s0\*(R" for a +amount of time after executing a statement. See \*(L"\s-1SQL STATEMENTS\*(R"\s0 for a definition of each statement and what it does. By default innotop does not delay after any statements. .Sp This feature is included so you can customize the side-effects caused by monitoring your server. You may not see any effects, but some innotop users have noticed that certain MySQL versions under very high load with InnoDB -enabled take longer than usual to execute \s-1SHOW\s0 \s-1GLOBAL\s0 \s-1STATUS\s0. If innotop calls -\&\s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0 immediately afterward, the processlist contains more +enabled take longer than usual to execute \s-1SHOW GLOBAL STATUS. \s0 If innotop calls +\&\s-1SHOW FULL PROCESSLIST\s0 immediately afterward, the processlist contains more queries than the machine actually averages at any given moment. Configuring -innotop to pause briefly after calling \s-1SHOW\s0 \s-1GLOBAL\s0 \s-1STATUS\s0 alleviates this +innotop to pause briefly after calling \s-1SHOW GLOBAL STATUS\s0 alleviates this effect. .Sp Sleep times are stored in the \*(L"stmt_sleep_times\*(R" section of the configuration @@ -759,28 +803,28 @@ file. Fractional-second sleeps are supported, subject to your hardware's limitations. .IP "c: Edit Columns" 4 .IX Item "c: Edit Columns" -Starts the table editor on one of the displayed tables. See \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R". +Starts the table editor on one of the displayed tables. See \*(L"\s-1TABLE EDITOR\*(R"\s0. An alternative way to start the table editor without entering the configuration dialog is with the '^' key. .IP "g: General Configuration" 4 .IX Item "g: General Configuration" Starts the configuration editor to edit global and mode-specific configuration -variables (see \*(L"\s-1MODES\s0\*(R"). innotop prompts you to choose a variable from among +variables (see \*(L"\s-1MODES\*(R"\s0). innotop prompts you to choose a variable from among the global and mode-specific ones depending on the current mode. .IP "k: Row-Coloring Rules" 4 .IX Item "k: Row-Coloring Rules" Starts the row-coloring rules editor on one of the displayed table(s). See -\&\*(L"\s-1COLORS\s0\*(R" for details. +\&\*(L"\s-1COLORS\*(R"\s0 for details. .IP "p: Manage Plugins" 4 .IX Item "p: Manage Plugins" -Starts the plugin configuration editor. See \*(L"\s-1PLUGINS\s0\*(R" for details. +Starts the plugin configuration editor. See \*(L"\s-1PLUGINS\*(R"\s0 for details. .IP "s: Server Groups" 4 .IX Item "s: Server Groups" -Lets you create and edit server groups. See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R". +Lets you create and edit server groups. See \*(L"\s-1SERVER GROUPS\*(R"\s0. .IP "t: Choose Displayed Tables" 4 .IX Item "t: Choose Displayed Tables" -Lets you choose which tables to display in this mode. See \*(L"\s-1MODES\s0\*(R" and -\&\*(L"\s-1TABLES\s0\*(R". +Lets you choose which tables to display in this mode. See \*(L"\s-1MODES\*(R"\s0 and +\&\*(L"\s-1TABLES\*(R"\s0. .SH "CONFIGURATION FILE" .IX Header "CONFIGURATION FILE" innotop's default configuration file locations are \f(CW$HOME\fR/.innotop and @@ -829,7 +873,7 @@ graphed; if s, values are like vmstat; if p, values are in a pivoted table. .IP "S_set" 4 .IX Item "S_set" Specifies which set of variables to display in \*(L"S: Variables & Status\*(R" mode. -See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R". +See \*(L"\s-1VARIABLE SETS\*(R"\s0. .IP "auto_wipe_dl" 4 .IX Item "auto_wipe_dl" Instructs innotop to automatically wipe large deadlocks when it notices them. @@ -866,7 +910,7 @@ crash. .IP "debugfile" 4 .IX Item "debugfile" A file to which innotop will write information when there is a crash. See -\&\*(L"\s-1FILES\s0\*(R". +\&\*(L"\s-1FILES\*(R"\s0. .IP "display_table_captions" 4 .IX Item "display_table_captions" innotop displays a table caption above most tables. This variable suppresses or @@ -875,7 +919,7 @@ hide_caption property, which overrides this. .IP "global" 4 .IX Item "global" Whether to show \s-1GLOBAL\s0 variables and status. innotop only tries to do this on -servers which support the \s-1GLOBAL\s0 option to \s-1SHOW\s0 \s-1VARIABLES\s0 and \s-1SHOW\s0 \s-1STATUS\s0. In +servers which support the \s-1GLOBAL\s0 option to \s-1SHOW VARIABLES\s0 and \s-1SHOW STATUS. \s0 In some MySQL versions, you need certain privileges to do this; if you don't have them, innotop will not be able to fetch any variable and status data. This configuration variable lets you run innotop and fetch what data you can even @@ -904,7 +948,7 @@ This variable accepts fractions of a second. .IP "mode" 4 .IX Item "mode" The mode in which innotop should start. Allowable arguments are the same as the -key presses that select a mode interactively. See \*(L"\s-1MODES\s0\*(R". +key presses that select a mode interactively. See \*(L"\s-1MODES\*(R"\s0. .IP "num_digits" 4 .IX Item "num_digits" How many digits to show in fractional numbers and percents. This variable's @@ -926,24 +970,28 @@ Specifies where plugins can be found. By default, innotop stores plugins in the Whether the configuration file is readonly. This cannot be set interactively. .IP "show_cxn_errors" 4 .IX Item "show_cxn_errors" -Makes innotop print connection errors to \s-1STDOUT\s0. See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R". +Makes innotop print connection errors to \s-1STDOUT. \s0 See \*(L"\s-1ERROR HANDLING\*(R"\s0. .IP "show_cxn_errors_in_tbl" 4 .IX Item "show_cxn_errors_in_tbl" Makes innotop display connection errors as rows in the first table on screen. -See \*(L"\s-1ERROR\s0 \s-1HANDLING\s0\*(R". +See \*(L"\s-1ERROR HANDLING\*(R"\s0. .IP "show_percent" 4 .IX Item "show_percent" Adds a '%' character after the value returned by the \*(L"percent\*(R" transformation. .IP "show_statusbar" 4 .IX Item "show_statusbar" -Controls whether to show the status bar in the display. See \*(L"\s-1INNOTOP\s0 -\&\s-1STATUS\s0\*(R". +Controls whether to show the status bar in the display. See \*(L"\s-1INNOTOP +STATUS\*(R"\s0. .IP "skip_innodb" 4 .IX Item "skip_innodb" -Disables fetching \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, in case your server(s) do not have InnoDB +Disables fetching \s-1SHOW INNODB STATUS,\s0 in case your server(s) do not have InnoDB enabled and you don't want innotop to try to fetch it. This can also be useful -when you don't have the \s-1SUPER\s0 privilege, required to run \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. +when you don't have the \s-1SUPER\s0 privilege, required to run \s-1SHOW INNODB STATUS.\s0 +.IP "spark" 4 +.IX Item "spark" +Specifies how wide a spark chart is. There are two \s-1ASCII\s0 spark charts in A +mode, showing \s-1QPS\s0 and User_threads_running. .IP "status_inc" 4 .IX Item "status_inc" Whether to show absolute or incremental values for status variables. @@ -951,16 +999,20 @@ Incremental values are calculated as an offset from the last value innotop saw for that variable. This is a global setting, but will probably become mode-specific at some point. Right now it is honored a bit inconsistently; some modes don't pay attention to it. +.IP "timeformat" 4 +.IX Item "timeformat" +The C\-style \fIstrftime()\fR\-compatible format for the timestamp line to be printed +in \-n mode when \-t is set. .RE .RS 4 .RE .IP "plugins" 4 .IX Item "plugins" This section holds a list of package names of active plugins. If the plugin -exists, innotop will activate it. See \*(L"\s-1PLUGINS\s0\*(R" for more information. +exists, innotop will activate it. See \*(L"\s-1PLUGINS\*(R"\s0 for more information. .IP "filters" 4 .IX Item "filters" -This section holds user-defined filters (see \*(L"\s-1FILTERS\s0\*(R"). Each line is in the +This section holds user-defined filters (see \*(L"\s-1FILTERS\*(R"\s0). Each line is in the format filter_name=text='filter text' tbls='table list'. .Sp The filter text is the text of the subroutine's code. The table list is a list @@ -973,7 +1025,7 @@ This section stores which filters are active on each table. Each line is in the format table_name=filter_list. .IP "tbl_meta" 4 .IX Item "tbl_meta" -This section stores user-defined or user-customized columns (see \*(L"\s-1COLUMNS\s0\*(R"). +This section stores user-defined or user-customized columns (see \*(L"\s-1COLUMNS\*(R"\s0). Each line is in the format col_name=properties, where the properties are a name=quoted\-value list. .IP "connections" 4 @@ -982,8 +1034,8 @@ This section holds the server connections you have defined. Each line is in the format name=properties, where the properties are a name=value list. The properties are self-explanatory, and the only one that is treated specially is \&'pass' which is only present if 'savepass' is set. This section of the -configuration file will be skipped if any \s-1DSN\s0, username, or password -command-line options are used. See \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R". +configuration file will be skipped if any \s-1DSN,\s0 username, or password +command-line options are used. See \*(L"\s-1SERVER CONNECTIONS\*(R"\s0. .IP "active_connections" 4 .IX Item "active_connections" This section holds a list of which connections are active in each mode. Each @@ -991,7 +1043,7 @@ line is in the format mode_name=connection_list. .IP "server_groups" 4 .IX Item "server_groups" This section holds server groups. Each line is in the format -name=connection_list. See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R". +name=connection_list. See \*(L"\s-1SERVER GROUPS\*(R"\s0. .IP "active_server_groups" 4 .IX Item "active_server_groups" This section holds a list of which server group is active in each mode. Each @@ -1004,24 +1056,24 @@ name=value. .IP "active_columns" 4 .IX Item "active_columns" This section holds table column lists. Each line is in the format -tbl_name=column_list. See \*(L"\s-1COLUMNS\s0\*(R". +tbl_name=column_list. See \*(L"\s-1COLUMNS\*(R"\s0. .IP "sort_cols" 4 .IX Item "sort_cols" This section holds the sort definition. Each line is in the format tbl_name=column_list. If a column is prefixed with '\-', that column sorts -descending. See \*(L"\s-1SORTING\s0\*(R". +descending. See \*(L"\s-1SORTING\*(R"\s0. .IP "visible_tables" 4 .IX Item "visible_tables" This section defines which tables are visible in each mode. Each line is in the -format mode_name=table_list. See \*(L"\s-1TABLES\s0\*(R". +format mode_name=table_list. See \*(L"\s-1TABLES\*(R"\s0. .IP "varsets" 4 .IX Item "varsets" This section defines variable sets for use in \*(L"S: Status & Variables\*(R" mode. -Each line is in the format name=variable_list. See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R". +Each line is in the format name=variable_list. See \*(L"\s-1VARIABLE SETS\*(R"\s0. .IP "colors" 4 .IX Item "colors" This section defines colorization rules. Each line is in the format -tbl_name=property_list. See \*(L"\s-1COLORS\s0\*(R". +tbl_name=property_list. See \*(L"\s-1COLORS\*(R"\s0. .IP "stmt_sleep_times" 4 .IX Item "stmt_sleep_times" This section contains statement sleep times. Each line is in the format @@ -1029,7 +1081,7 @@ statement_name=sleep_time. See \*(L"S: Statement Sleep Times\*(R". .IP "group_by" 4 .IX Item "group_by" This section contains column lists for table group_by expressions. Each line is -in the format tbl_name=column_list. See \*(L"\s-1GROUPING\s0\*(R". +in the format tbl_name=column_list. See \*(L"\s-1GROUPING\*(R"\s0. .SH "CUSTOMIZING" .IX Header "CUSTOMIZING" You can customize innotop a great deal. For example, you can: @@ -1065,10 +1117,10 @@ instructions to innotop. The meta-data includes the caption, a list of columns the user has customized, a list of columns, a list of visible columns, a list of filters, color rules, a sort-column list, sort direction, and some information about the table's data sources. Most of this is customizable via the table -editor (see \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R"). +editor (see \*(L"\s-1TABLE EDITOR\*(R"\s0). .PP -You can choose which tables to show by pressing the '$' key. See \*(L"\s-1MODES\s0\*(R" and -\&\*(L"\s-1TABLES\s0\*(R". +You can choose which tables to show by pressing the '$' key. See \*(L"\s-1MODES\*(R"\s0 and +\&\*(L"\s-1TABLES\*(R"\s0. .PP The table life-cycle is as follows: .IP "\(bu" 4 @@ -1081,21 +1133,21 @@ For each element in the data source, innotop extracts values from the source and creates a row. This row is another hash, which later steps will refer to as \&\f(CW$set\fR. The values innotop extracts are determined by the table's columns. Each column has an extraction subroutine, compiled from an expression (see -\&\*(L"\s-1EXPRESSIONS\s0\*(R"). The resulting row is a hash whose keys are named the same as +\&\*(L"\s-1EXPRESSIONS\*(R"\s0). The resulting row is a hash whose keys are named the same as the column name. .IP "\(bu" 4 innotop filters the rows, removing those that don't need to be displayed. See -\&\*(L"\s-1FILTERS\s0\*(R". +\&\*(L"\s-1FILTERS\*(R"\s0. .IP "\(bu" 4 -innotop sorts the rows. See \*(L"\s-1SORTING\s0\*(R". +innotop sorts the rows. See \*(L"\s-1SORTING\*(R"\s0. .IP "\(bu" 4 -innotop groups the rows together, if specified. See \*(L"\s-1GROUPING\s0\*(R". +innotop groups the rows together, if specified. See \*(L"\s-1GROUPING\*(R"\s0. .IP "\(bu" 4 -innotop colorizes the rows. See \*(L"\s-1COLORS\s0\*(R". +innotop colorizes the rows. See \*(L"\s-1COLORS\*(R"\s0. .IP "\(bu" 4 -innotop transforms the column values in each row. See \*(L"\s-1TRANSFORMATIONS\s0\*(R". +innotop transforms the column values in each row. See \*(L"\s-1TRANSFORMATIONS\*(R"\s0. .IP "\(bu" 4 -innotop optionally pivots the rows (see \*(L"\s-1PIVOTING\s0\*(R"), then filters and sorts +innotop optionally pivots the rows (see \*(L"\s-1PIVOTING\*(R"\s0), then filters and sorts them. .IP "\(bu" 4 innotop formats and justifies the rows as a table. During this step, innotop @@ -1108,7 +1160,7 @@ The lifecycle is slightly different if the table is pivoted, as noted above. To clarify, if the table is pivoted, the process is extract, group, transform, pivot, filter, sort, create. If it's not pivoted, the process is extract, filter, sort, group, color, transform, create. This slightly convoluted process -doesn't map all that well to \s-1SQL\s0, but pivoting complicates things pretty +doesn't map all that well to \s-1SQL,\s0 but pivoting complicates things pretty thoroughly. Roughly speaking, filtering and sorting happen as late as needed to effect the final result as you might expect, but as early as possible for efficiency. @@ -1117,99 +1169,119 @@ Each built-in table is described below: .IP "adaptive_hash_index" 4 .IX Item "adaptive_hash_index" Displays data about InnoDB's adaptive hash index. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "buffer_pool" 4 .IX Item "buffer_pool" -Displays data about InnoDB's buffer pool. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays data about InnoDB's buffer pool. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "cmd_summary" 4 .IX Item "cmd_summary" -Displays weighted status variables. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays weighted status variables. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "deadlock_locks" 4 .IX Item "deadlock_locks" Shows which locks were held and waited for by the last detected deadlock. Data -source: \*(L"\s-1DEADLOCK_LOCKS\s0\*(R". +source: \*(L"\s-1DEADLOCK_LOCKS\*(R"\s0. .IP "deadlock_transactions" 4 .IX Item "deadlock_transactions" Shows transactions involved in the last detected deadlock. Data source: -\&\*(L"\s-1DEADLOCK_TRANSACTIONS\s0\*(R". +\&\*(L"\s-1DEADLOCK_TRANSACTIONS\*(R"\s0. .IP "explain" 4 .IX Item "explain" -Shows the output of \s-1EXPLAIN\s0. Data source: \*(L"\s-1EXPLAIN\s0\*(R". +Shows the output of \s-1EXPLAIN. \s0 Data source: \*(L"\s-1EXPLAIN\*(R"\s0. .IP "file_io_misc" 4 .IX Item "file_io_misc" Displays data about InnoDB's file and I/O operations. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "fk_error" 4 .IX Item "fk_error" Displays various data about InnoDB's last foreign key error. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. +.IP "health_dashboard" 4 +.IX Item "health_dashboard" +Displays an overall summary of servers, one server per line, for monitoring. +Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0, \*(L"\s-1MASTER_SLAVE\*(R"\s0, \*(L"\s-1PROCESSLIST_STATS\*(R"\s0. +.IP "index_statistics" 4 +.IX Item "index_statistics" +Displays data from the \s-1INDEX_STATISTICS\s0 table in Percona-enhanced servers. +.IP "index_table_statistics" 4 +.IX Item "index_table_statistics" +Displays data from the \s-1INDEX_STATISTICS\s0 and \s-1TABLE_STATISTICS\s0 tables in +Percona-enhanced servers. It joins the two together, grouped by the database +and table name. It is the default view in \*(L"U: User Statistics\*(R" mode, +and makes it easy to see what tables are hot, how many rows are read from indexes, +how many changes are made, and how many changes are made to indexes. +.IP "innodb_blocked_blocker" 4 +.IX Item "innodb_blocked_blocker" +Displays InnoDB locks and lock waits. Data source: \*(L"\s-1INNODB_BLOCKED_BLOCKER\*(R"\s0. .IP "innodb_locks" 4 .IX Item "innodb_locks" -Displays InnoDB locks. Data source: \*(L"\s-1INNODB_LOCKS\s0\*(R". +Displays InnoDB locks. Data source: \*(L"\s-1INNODB_LOCKS\*(R"\s0. .IP "innodb_transactions" 4 .IX Item "innodb_transactions" Displays data about InnoDB's current transactions. Data source: -\&\*(L"\s-1INNODB_TRANSACTIONS\s0\*(R". +\&\*(L"\s-1INNODB_TRANSACTIONS\*(R"\s0. .IP "insert_buffers" 4 .IX Item "insert_buffers" -Displays data about InnoDB's insert buffer. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays data about InnoDB's insert buffer. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "io_threads" 4 .IX Item "io_threads" -Displays data about InnoDB's I/O threads. Data source: \*(L"\s-1IO_THREADS\s0\*(R". +Displays data about InnoDB's I/O threads. Data source: \*(L"\s-1IO_THREADS\*(R"\s0. .IP "log_statistics" 4 .IX Item "log_statistics" -Displays data about InnoDB's logging system. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays data about InnoDB's logging system. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "master_status" 4 .IX Item "master_status" -Displays replication master status. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays replication master status. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "open_tables" 4 .IX Item "open_tables" -Displays open tables. Data source: \*(L"\s-1OPEN_TABLES\s0\*(R". +Displays open tables. Data source: \*(L"\s-1OPEN_TABLES\*(R"\s0. .IP "page_statistics" 4 .IX Item "page_statistics" -Displays InnoDB page statistics. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays InnoDB page statistics. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "pending_io" 4 .IX Item "pending_io" -Displays InnoDB pending I/O operations. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays InnoDB pending I/O operations. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "processlist" 4 .IX Item "processlist" Displays current MySQL processes (threads/connections). Data source: -\&\*(L"\s-1PROCESSLIST\s0\*(R". +\&\*(L"\s-1PROCESSLIST\*(R"\s0. .IP "q_header" 4 .IX Item "q_header" -Displays various status values. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays various status values. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "row_operation_misc" 4 .IX Item "row_operation_misc" Displays data about InnoDB's row operations. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "row_operations" 4 .IX Item "row_operations" Displays data about InnoDB's row operations. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "semaphores" 4 .IX Item "semaphores" Displays data about InnoDB's semaphores and mutexes. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "slave_io_status" 4 .IX Item "slave_io_status" Displays data about the slave I/O thread. Data source: -\&\*(L"\s-1STATUS_VARIABLES\s0\*(R". +\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "slave_sql_status" 4 .IX Item "slave_sql_status" -Displays data about the slave \s-1SQL\s0 thread. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays data about the slave \s-1SQL\s0 thread. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. +.IP "table_statistics" 4 +.IX Item "table_statistics" +Displays data from the \s-1TABLE_STATISTICS\s0 table in Percona-enhanced servers. .IP "t_header" 4 .IX Item "t_header" -Displays various InnoDB status values. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays various InnoDB status values. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "var_status" 4 .IX Item "var_status" -Displays user-configurable data. Data source: \*(L"\s-1STATUS_VARIABLES\s0\*(R". +Displays user-configurable data. Data source: \*(L"\s-1STATUS_VARIABLES\*(R"\s0. .IP "wait_array" 4 .IX Item "wait_array" -Displays data about InnoDB's \s-1OS\s0 wait array. Data source: \*(L"\s-1OS_WAIT_ARRAY\s0\*(R". +Displays data about InnoDB's \s-1OS\s0 wait array. Data source: \*(L"\s-1OS_WAIT_ARRAY\*(R"\s0. .SS "\s-1COLUMNS\s0" .IX Subsection "COLUMNS" Columns belong to tables. You can choose a table's columns by pressing the '^' -key, which starts the \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R" and lets you choose and edit columns. +key, which starts the \*(L"\s-1TABLE EDITOR\*(R"\s0 and lets you choose and edit columns. Pressing 'e' from within the table editor lets you edit the column's properties: .IP "\(bu" 4 hdr: a column header. This appears in the first row of the table. @@ -1226,28 +1298,30 @@ label: a small note about the column, which appears in dialogs that help the user choose columns. .IP "\(bu" 4 src: an expression that innotop uses to extract the column's data from its -source (see \*(L"\s-1DATA\s0 \s-1SOURCES\s0\*(R"). See \*(L"\s-1EXPRESSIONS\s0\*(R" for more on expressions. +source (see \*(L"\s-1DATA SOURCES\*(R"\s0). See \*(L"\s-1EXPRESSIONS\*(R"\s0 for more on expressions. .IP "\(bu" 4 minw: specifies a minimum display width. This helps stabilize the display, which makes it easier to read if the data is changing frequently. .IP "\(bu" 4 maxw: similar to minw. .IP "\(bu" 4 -trans: a list of column transformations. See \*(L"\s-1TRANSFORMATIONS\s0\*(R". +trans: a list of column transformations. See \*(L"\s-1TRANSFORMATIONS\*(R"\s0. .IP "\(bu" 4 -agg: an aggregate function. See \*(L"\s-1GROUPING\s0\*(R". The default is \*(L"first\*(R". +agg: an aggregate function. See \*(L"\s-1GROUPING\*(R"\s0. The default is \*(L"first\*(R". .IP "\(bu" 4 aggonly: controls whether the column only shows when grouping is enabled on the -table (see \*(L"\s-1GROUPING\s0\*(R"). By default, this is disabled. This means columns +table (see \*(L"\s-1GROUPING\*(R"\s0). By default, this is disabled. This means columns will always be shown by default, whether grouping is enabled or not. If a column's aggonly is set true, the column will appear when you toggle grouping on the table. Several columns are set this way, such as the count column on \&\*(L"processlist\*(R" and \*(L"innodb_transactions\*(R", so you don't see a count when the grouping isn't enabled, but you do when it is. +.IP "\(bu" 4 +agghide: the reverse of aggonly. The column is hidden when grouping is enabled. .SS "\s-1FILTERS\s0" .IX Subsection "FILTERS" Filters remove rows from the display. They behave much like a \s-1WHERE\s0 clause in -\&\s-1SQL\s0. innotop has several built-in filters, which remove irrelevant information +\&\s-1SQL. \s0 innotop has several built-in filters, which remove irrelevant information like inactive queries, but you can define your own as well. innotop also lets you create quick-filters, which do not get saved to the configuration file, and are just an easy way to quickly view only some rows. @@ -1297,11 +1371,30 @@ persist when you restart innotop. To create a quick-filter, press the '/' key. innotop will prompt you for the column name and filter text. Again, you can use auto-completion on column names. The filter text can be just the text you want to \*(L"search for.\*(R" For example, to filter the \*(L"processlist\*(R" table on queries -that refer to the products table, type '/' and then 'info product'. +that refer to the products table, type '/' and then 'info product'. Internally, +the filter is compiled into a subroutine like this: +.PP +.Vb 4 +\& sub filter { +\& my ( $set ) = @_; +\& $set\->{info} =~ m/product/; +\& } +.Ve .PP The filter text can actually be any Perl regular expression, but of course a literal string like 'product' works fine as a regular expression. .PP +What if you want the filter to discard matching rows, rather than showing +matching rows? If you're familiar with Perl regular expressions, you might +guess how to do this. You have to use a zero-width negative lookahead +assertion. If you don't know what that means, don't worry. Let's filter out +all rows where the command is Gandalf. Type the following: +.PP +.Vb 2 +\& 1. / +\& 2. cmd ^(?!Gandalf) +.Ve +.PP Behind the scenes innotop compiles the quick-filter into a specially tagged filter that is otherwise like any other filter. It just isn't saved to the configuration file. @@ -1314,7 +1407,7 @@ innotop has sensible built-in defaults to sort the most important rows to the top of the table. Like anything else in innotop, you can customize how any table is sorted. .PP -To start the sort dialog, start the \*(L"\s-1TABLE\s0 \s-1EDITOR\s0\*(R" with the '^' key, choose a +To start the sort dialog, start the \*(L"\s-1TABLE EDITOR\*(R"\s0 with the '^' key, choose a table if necessary, and press the 's' key. You'll see a list of columns you can use in the sort expression and the current sort expression, if any. Enter a list of columns by which you want to sort and press Enter. If you want to @@ -1328,9 +1421,9 @@ sort direction. Press '?' as usual to see which keys are mapped in any mode. .SS "\s-1GROUPING\s0" .IX Subsection "GROUPING" innotop can group, or aggregate, rows together (the terms are used -interchangeably). This is quite similar to an \s-1SQL\s0 \s-1GROUP\s0 \s-1BY\s0 clause. You can +interchangeably). This is quite similar to an \s-1SQL GROUP BY\s0 clause. You can specify to group on certain columns, or if you don't specify any, the entire set -of rows is treated as one group. This is quite like \s-1SQL\s0 so far, but unlike \s-1SQL\s0, +of rows is treated as one group. This is quite like \s-1SQL\s0 so far, but unlike \s-1SQL,\s0 you can also select un-grouped columns. innotop actually aggregates every column. If you don't explicitly specify a grouping function, the default is \&'first'. This is basically a convenience so you don't have to specify an @@ -1391,8 +1484,8 @@ That's actually quite a worrisome picture. You've got a lot of idle connections (Sleep), and some connections executing queries (Query and Sending Data). That's okay, but you also have a lot in Statistics status, collectively spending over a minute. That means the query optimizer is having a really hard time -optimizing your statements. Something is wrong; it should normally take -milliseconds to optimize queries. You might not have seen this pattern if you +generating execution plans for your statements. Something is wrong; it should +normally take milliseconds to plan queries. You might not have seen this pattern if you didn't look at your connections in aggregate. (This is a made-up example, but it can happen in real life). .SS "\s-1PIVOTING\s0" @@ -1467,7 +1560,7 @@ quoted something. .IX Subsection "EXPRESSIONS" Expressions are at the core of how innotop works, and are what enables you to extend innotop as you wish. Recall the table lifecycle explained in -\&\*(L"\s-1TABLES\s0\*(R". Expressions are used in the earliest step, where it extracts +\&\*(L"\s-1TABLES\*(R"\s0. Expressions are used in the earliest step, where it extracts values from a data source to form rows. .PP It does this by calling a subroutine for each column, passing it the source data @@ -1500,7 +1593,7 @@ subroutine, like this: .PP Here's a concrete example, taken from the header table \*(L"q_header\*(R" in \*(L"Q: Query List\*(R" mode. This expression calculates the qps, or Queries Per Second, -column's values, from the values returned by \s-1SHOW\s0 \s-1STATUS:\s0 +column's values, from the values returned by \s-1SHOW STATUS:\s0 .PP .Vb 1 \& Questions/Uptime_hires @@ -1532,11 +1625,17 @@ are defined: .IP "commify" 4 .IX Item "commify" Adds commas to large numbers every three decimal places. +.IP "distill" 4 +.IX Item "distill" +Distills \s-1SQL\s0 into verb-noun-noun format for quick comprehension. .IP "dulint_to_int" 4 .IX Item "dulint_to_int" Accepts two unsigned integers and converts them into a single longlong. This is useful for certain operations with InnoDB, which uses two integers as transaction identifiers, for example. +.IP "fuzzy_time" 4 +.IX Item "fuzzy_time" +Converts a number of seconds into a friendly, readable value like \*(L"1h35m\*(R". .IP "no_ctrl_char" 4 .IX Item "no_ctrl_char" Removes quoted control characters from the value. This is affected by the @@ -1561,7 +1660,7 @@ Formats numbers with \*(L"num_digits\*(R" number of digits after the decimal poi .IX Item "shorten" Formats a number as a unit of 1024 (k/M/G/T) and with \*(L"num_digits\*(R" number of digits after the decimal point. -.SS "\s-1TABLE\s0 \s-1EDITOR\s0" +.SS "\s-1TABLE EDITOR\s0" .IX Subsection "TABLE EDITOR" The innotop table editor lets you customize tables with keystrokes. You start the table editor with the '^' key. If there's more than one table on the @@ -1579,7 +1678,7 @@ show you something like this: \& pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m \& buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo \& total_mem_alloc Memory Total memory allocate IB_bp_total_m -\& add_pool_alloc Add\*(Aql Pool Additional pool alloca IB_bp_add_poo +\& add_pool_alloc Add\*(Aql Pool Additonal pool alloca IB_bp_add_poo .Ve .PP The first line shows which table you're editing, and reminds you again to press @@ -1590,7 +1689,7 @@ editor, color rule editor, and more. .PP Each row in the display shows a single column in the table you're editing, along with a couple of its properties such as its header and source expression (see -\&\*(L"\s-1EXPRESSIONS\s0\*(R"). +\&\*(L"\s-1EXPRESSIONS\*(R"\s0). .PP The key mappings are Vim-style, as in many other places. Pressing 'j' and 'k' moves the highlight up or down. You can then (d)elete or (e)dit the highlighted @@ -1615,9 +1714,9 @@ the table header. This can have spaces and funny characters, but be careful not to make it too wide and waste space on-screen. .IP "\(bu" 4 The column's data source: this is an expression that determines what data from -the source (see \*(L"\s-1TABLES\s0\*(R") innotop will put into the column. This can just be +the source (see \*(L"\s-1TABLES\*(R"\s0) innotop will put into the column. This can just be the name of an item in the source, or it can be a more complex expression, as -described in \*(L"\s-1EXPRESSIONS\s0\*(R". +described in \*(L"\s-1EXPRESSIONS\*(R"\s0. .PP Once you've entered the required data, your table has a new column. There is no difference between this column and the built-in ones; it can have all the same @@ -1645,10 +1744,10 @@ what variables you want to monitor. Behind the scenes they are compiled to a list of expressions, and then into a column list so they can be treated just like columns in any other table, in terms of data extraction and transformations. However, you're protected from the tedious details by a syntax -that ought to feel very natural to you: a \s-1SQL\s0 \s-1SELECT\s0 list. +that ought to feel very natural to you: a \s-1SQL SELECT\s0 list. .PP The data source for variable sets, and indeed the entire S mode, is the -combination of \s-1SHOW\s0 \s-1STATUS\s0, \s-1SHOW\s0 \s-1VARIABLES\s0, and \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. Imagine +combination of \s-1SHOW STATUS, SHOW VARIABLES,\s0 and \s-1SHOW INNODB STATUS. \s0 Imagine that you had a huge table with one column per variable returned from those statements. That's the data source for variable sets. You can now query this data source just like you'd expect. For example: @@ -1669,7 +1768,7 @@ start for creating your own. Press 'e' to edit the current variable set, or just to see how it's defined. To create a new one, just press 'c' and type its name. .PP -You may want to use some of the functions listed in \*(L"\s-1TRANSFORMATIONS\s0\*(R" to help +You may want to use some of the functions listed in \*(L"\s-1TRANSFORMATIONS\*(R"\s0 to help format the results. In particular, \*(L"set_precision\*(R" is often useful to limit the number of digits you see. Extending the above example, here's how: .PP @@ -1694,9 +1793,9 @@ or modify its existing functionality, and add new functionality. innotop's plugin functionality is event-based: plugins register themselves to be called when events happen. They then have a chance to influence the event. .PP -An innotop plugin is a Perl module placed in innotop's \*(L"plugin_dir\*(R" +An innotop plugin is a Perl module (.pm) file placed in innotop's \*(L"plugin_dir\*(R" directory. On \s-1UNIX\s0 systems, you can place a symbolic link to the module instead -of putting the actual file there. innotop automatically discovers the file. If +of putting the actual file there. innotop automatically discovers files named \f(CW\*(C`*.pm\*(C'\fR. If there is a corresponding entry in the \*(L"plugins\*(R" configuration file section, innotop loads and activates the plugin. .PP @@ -1708,7 +1807,7 @@ file and determine the package name and description. innotop inspects the plugin module's source to determine the Perl package name. It looks for a line of the form \*(L"package Foo;\*(R" and if found, considers the plugin's package name to be Foo. Of course the package name can be a valid Perl -package name, with double semicolons and so on. +package name such as Foo::Bar, with double colons (::) and so on. .PP It also looks for a description in the source code, to make the plugin editor more human-friendly. The description is a comment line of the form \*(L"# @@ -1758,7 +1857,7 @@ for later use. The variables are defined in the innotop variable A hashref of key mappings. These are innotop's global hot-keys. .IP "agg_funcs" 4 .IX Item "agg_funcs" -A hashref of functions that can be used for grouping. See \*(L"\s-1GROUPING\s0\*(R". +A hashref of functions that can be used for grouping. See \*(L"\s-1GROUPING\*(R"\s0. .IP "config" 4 .IX Item "config" The global configuration hash. @@ -1772,23 +1871,23 @@ A hashref of innotop's database connections. These are actual \s-1DBI\s0 connec objects. .IP "filters" 4 .IX Item "filters" -A hashref of filters applied to table rows. See \*(L"\s-1FILTERS\s0\*(R" for more. +A hashref of filters applied to table rows. See \*(L"\s-1FILTERS\*(R"\s0 for more. .IP "modes" 4 .IX Item "modes" -A hashref of modes. See \*(L"\s-1MODES\s0\*(R" for more. +A hashref of modes. See \*(L"\s-1MODES\*(R"\s0 for more. .IP "server_groups" 4 .IX Item "server_groups" -A hashref of server groups. See \*(L"\s-1SERVER\s0 \s-1GROUPS\s0\*(R". +A hashref of server groups. See \*(L"\s-1SERVER GROUPS\*(R"\s0. .IP "tbl_meta" 4 .IX Item "tbl_meta" A hashref of innotop's table meta-data, with one entry per table (see -\&\*(L"\s-1TABLES\s0\*(R" for more information). +\&\*(L"\s-1TABLES\*(R"\s0 for more information). .IP "trans_funcs" 4 .IX Item "trans_funcs" -A hashref of transformation functions. See \*(L"\s-1TRANSFORMATIONS\s0\*(R". +A hashref of transformation functions. See \*(L"\s-1TRANSFORMATIONS\*(R"\s0. .IP "var_sets" 4 .IX Item "var_sets" -A hashref of variable sets. See \*(L"\s-1VARIABLE\s0 \s-1SETS\s0\*(R". +A hashref of variable sets. See \*(L"\s-1VARIABLE SETS\*(R"\s0. .SS "Plugin Events" .IX Subsection "Plugin Events" Each event is defined somewhere in the innotop source code. When innotop runs @@ -1818,7 +1917,9 @@ This event occurs inside the subroutine that prints the lines to the screen. .IX Subsection "Simple Plugin Example" The easiest way to explain the plugin functionality is probably with a simple example. The following module adds a column to the beginning of every table and -sets its value to 1. +sets its value to 1. (If you copy and paste this example code, be sure to remove +the first space from each line; lines such as '# description' must not start with +whitespace). .PP .Vb 2 \& use strict; @@ -1887,12 +1988,13 @@ inactive. Exit the editor and restart innotop for the changes to take effect. innotop uses a limited set of \s-1SQL\s0 statements to retrieve data from MySQL for display. The statements are customized depending on the server version against which they are executed; for example, on MySQL 5 and newer, \s-1INNODB_STATUS\s0 -executes \*(L"\s-1SHOW\s0 \s-1ENGINE\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R", while on earlier versions it executes -\&\*(L"\s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R". The statements are as follows: +executes \*(L"\s-1SHOW ENGINE INNODB STATUS\*(R",\s0 while on earlier versions it executes +\&\*(L"\s-1SHOW INNODB STATUS\*(R". \s0 The statements are as follows: .PP -.Vb 12 +.Vb 10 \& Statement SQL executed \& =================== =============================== +\& INDEX_STATISTICS SELECT * FROM INFORMATION_SCHEMA.INDEX_STATISTICS \& INNODB_STATUS SHOW [ENGINE] INNODB STATUS \& KILL_CONNECTION KILL \& KILL_QUERY KILL QUERY @@ -1903,13 +2005,14 @@ executes \*(L"\s-1SHOW\s0 \s-1ENGINE\s0 \s-1INNODB\s0 \s-1STATUS\s0\*(R", while \& SHOW_SLAVE_STATUS SHOW SLAVE STATUS \& SHOW_STATUS SHOW [GLOBAL] STATUS \& SHOW_VARIABLES SHOW [GLOBAL] VARIABLES +\& TABLE_STATISTICS SELECT * FROM INFORMATION_SCHEMA.TABLE_STATISTICS .Ve .SH "DATA SOURCES" .IX Header "DATA SOURCES" -Each time innotop extracts values to create a table (see \*(L"\s-1EXPRESSIONS\s0\*(R" and -\&\*(L"\s-1TABLES\s0\*(R"), it does so from a particular data source. Largely because of the -complex data extracted from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0, this is slightly messy. \s-1SHOW\s0 -\&\s-1INNODB\s0 \s-1STATUS\s0 contains a mixture of single values and repeated values that form +Each time innotop extracts values to create a table (see \*(L"\s-1EXPRESSIONS\*(R"\s0 and +\&\*(L"\s-1TABLES\*(R"\s0), it does so from a particular data source. Largely because of the +complex data extracted from \s-1SHOW INNODB STATUS,\s0 this is slightly messy. \s-1SHOW +INNODB STATUS\s0 contains a mixture of single values and repeated values that form nested data sets. .PP Whenever innotop fetches data from MySQL, it adds two extra bits to each set: @@ -1921,41 +2024,53 @@ Here are the kinds of data sources from which data is extracted: .IP "\s-1STATUS_VARIABLES\s0" 4 .IX Item "STATUS_VARIABLES" This is the broadest category, into which the most kinds of data fall. It -begins with the combination of \s-1SHOW\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1VARIABLES\s0, but other sources -may be included as needed, for example, \s-1SHOW\s0 \s-1MASTER\s0 \s-1STATUS\s0 and \s-1SHOW\s0 \s-1SLAVE\s0 -\&\s-1STATUS\s0, as well as many of the non-repeated values from \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. +begins with the combination of \s-1SHOW STATUS\s0 and \s-1SHOW VARIABLES,\s0 but other sources +may be included as needed, for example, \s-1SHOW MASTER STATUS\s0 and \s-1SHOW SLAVE +STATUS,\s0 as well as many of the non-repeated values from \s-1SHOW INNODB STATUS.\s0 .IP "\s-1DEADLOCK_LOCKS\s0" 4 .IX Item "DEADLOCK_LOCKS" -This data is extracted from the transaction list in the \s-1LATEST\s0 \s-1DETECTED\s0 \s-1DEADLOCK\s0 -section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. It is nested two levels deep: transactions, then +This data is extracted from the transaction list in the \s-1LATEST DETECTED DEADLOCK\s0 +section of \s-1SHOW INNODB STATUS. \s0 It is nested two levels deep: transactions, then locks. .IP "\s-1DEADLOCK_TRANSACTIONS\s0" 4 .IX Item "DEADLOCK_TRANSACTIONS" -This data is from the transaction list in the \s-1LATEST\s0 \s-1DETECTED\s0 \s-1DEADLOCK\s0 -section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. It is nested one level deep. +This data is from the transaction list in the \s-1LATEST DETECTED DEADLOCK\s0 +section of \s-1SHOW INNODB STATUS. \s0 It is nested one level deep. .IP "\s-1EXPLAIN\s0" 4 .IX Item "EXPLAIN" -This data is from the result set returned by \s-1EXPLAIN\s0. +This data is from the result set returned by \s-1EXPLAIN.\s0 +.IP "\s-1INNODB_BLOCKED_BLOCKER\s0" 4 +.IX Item "INNODB_BLOCKED_BLOCKER" +This data is from the \s-1INFORMATION_SCHEMA\s0 tables related to InnoDB locks and +the processlist. .IP "\s-1INNODB_TRANSACTIONS\s0" 4 .IX Item "INNODB_TRANSACTIONS" -This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0. +This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS.\s0 .IP "\s-1IO_THREADS\s0" 4 .IX Item "IO_THREADS" -This data is from the list of threads in the the \s-1FILE\s0 I/O section of \s-1SHOW\s0 \s-1INNODB\s0 -\&\s-1STATUS\s0. +This data is from the list of threads in the the \s-1FILE I/O\s0 section of \s-1SHOW INNODB +STATUS.\s0 .IP "\s-1INNODB_LOCKS\s0" 4 .IX Item "INNODB_LOCKS" -This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 and is nested +This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS\s0 and is nested two levels deep. +.IP "\s-1MASTER_SLAVE\s0" 4 +.IX Item "MASTER_SLAVE" +This data is from the combination of \s-1SHOW MASTER STATUS\s0 and \s-1SHOW SLAVE STATUS.\s0 .IP "\s-1OPEN_TABLES\s0" 4 .IX Item "OPEN_TABLES" -This data is from \s-1SHOW\s0 \s-1OPEN\s0 \s-1TABLES\s0. +This data is from \s-1SHOW OPEN TABLES.\s0 .IP "\s-1PROCESSLIST\s0" 4 .IX Item "PROCESSLIST" -This data is from \s-1SHOW\s0 \s-1FULL\s0 \s-1PROCESSLIST\s0. +This data is from \s-1SHOW FULL PROCESSLIST.\s0 +.IP "\s-1PROCESSLIST_STATS\s0" 4 +.IX Item "PROCESSLIST_STATS" +This data is from \s-1SHOW FULL PROCESSLIST\s0 and computes stats such as the maximum time +a user query has been running, and how many user queries are running. A \*(L"user +query\*(R" excludes replication threads. .IP "\s-1OS_WAIT_ARRAY\s0" 4 .IX Item "OS_WAIT_ARRAY" -This data is from the \s-1SEMAPHORES\s0 section of \s-1SHOW\s0 \s-1INNODB\s0 \s-1STATUS\s0 and is nested one +This data is from the \s-1SEMAPHORES\s0 section of \s-1SHOW INNODB STATUS\s0 and is nested one level deep. It comes from the lines that look like this: .Sp .Vb 1 @@ -1976,15 +2091,15 @@ mode. You need special privileges to start and stop slave servers. .IP "\(bu" 4 You need appropriate privileges to create and drop the deadlock tables if needed -(see \*(L"\s-1SERVER\s0 \s-1CONNECTIONS\s0\*(R"). +(see \*(L"\s-1SERVER CONNECTIONS\*(R"\s0). .SH "SYSTEM REQUIREMENTS" .IX Header "SYSTEM REQUIREMENTS" -You need Perl to run innotop, of course. You also need a few Perl modules: \s-1DBI\s0, +You need Perl to run innotop, of course. You also need a few Perl modules: \s-1DBI,\s0 DBD::mysql, Term::ReadKey, and Time::HiRes. These should be included with most Perl distributions, but in case they are not, I recommend using versions -distributed with your operating system or Perl distribution, not from \s-1CPAN\s0. +distributed with your operating system or Perl distribution, not from \s-1CPAN.\s0 Term::ReadKey in particular has been known to cause problems if installed from -\&\s-1CPAN\s0. +\&\s-1CPAN.\s0 .PP If you have Term::ANSIColor, innotop will use it to format headers more readably and compactly. (Under Microsoft Windows, you also need Win32::Console::ANSI for @@ -1992,7 +2107,7 @@ terminal formatting codes to be honored). If you install Term::ReadLine, preferably Term::ReadLine::Gnu, you'll get nice auto-completion support. .PP I run innotop on Gentoo GNU/Linux, Debian and Ubuntu, and I've had feedback from -people successfully running it on Red Hat, CentOS, Solaris, and Mac \s-1OSX\s0. I +people successfully running it on Red Hat, CentOS, Solaris, and Mac \s-1OSX. I\s0 don't see any reason why it won't work on other UNIX-ish operating systems, but I don't know for sure. It also runs on Windows under ActivePerl without problem. @@ -2017,6 +2132,7 @@ displays it. The following people and organizations are acknowledged for various reasons. Hopefully no one has been forgotten. .PP +Aaron Racine, Allen K. Smith, Aurimas Mikalauskas, Bartosz Fenski, @@ -2038,7 +2154,7 @@ Kristian Kohntopp, Lenz Grimmer, Maciej Dobrzanski, Michiel Betel, -MySQL \s-1AB\s0, +MySQL \s-1AB,\s0 Paul McCullagh, Sebastien Estienne, Sourceforge.net, @@ -2056,9 +2172,9 @@ not be able to compile it then). This program is copyright (c) 2006 Baron Schwartz. Feedback and improvements are welcome. .PP -\&\s-1THIS\s0 \s-1PROGRAM\s0 \s-1IS\s0 \s-1PROVIDED\s0 \*(L"\s-1AS\s0 \s-1IS\s0\*(R" \s-1AND\s0 \s-1WITHOUT\s0 \s-1ANY\s0 \s-1EXPRESS\s0 \s-1OR\s0 \s-1IMPLIED\s0 -\&\s-1WARRANTIES\s0, \s-1INCLUDING\s0, \s-1WITHOUT\s0 \s-1LIMITATION\s0, \s-1THE\s0 \s-1IMPLIED\s0 \s-1WARRANTIES\s0 \s-1OF\s0 -\&\s-1MERCHANTIBILITY\s0 \s-1AND\s0 \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. +\&\s-1THIS PROGRAM IS PROVIDED \*(L"AS IS\*(R" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.\s0 .PP This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License as published by the Free Software @@ -2067,8 +2183,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. .PP You should have received a copy of the \s-1GNU\s0 General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, \s-1MA\s0 02111\-1307 \s-1USA\s0. +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin +Street, Fifth Floor, Boston, \s-1MA\s0 02111\-1301 \s-1USA\s0. .PP Execute innotop and press '!' to see this information at any time. .SH "AUTHOR" @@ -2077,7 +2193,7 @@ Originally written by Baron Schwartz; currently maintained by Aaron Racine. .SH "BUGS" .IX Header "BUGS" You can report bugs, ask for improvements, and get other help and support at -<http://code.google.com/p/innotop/>. There are mailing lists, a source code +<https://github.com/innotop/innotop>. There are mailing lists, a source code browser, a bug tracker, etc. Please use these instead of contacting the maintainer or author directly, as it makes our job easier and benefits others if the discussions are permanent and public. Of course, if you need to contact us in diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index a27f8543f0b..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 @@ -151,7 +151,25 @@ innodb_flush_method = O_DIRECT # ssl-cert=/etc/mysql/server-cert.pem # ssl-key=/etc/mysql/server-key.pem - +# +# * Galera-related settings +# +[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 +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 [mysqldump] quick @@ -159,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..64eaf93783a 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"; @@ -341,7 +357,7 @@ sub read_relative_infiles select $tmpfile_fh[$i]; - # Read infile again and copy each set of status values to seperate tmp files + # Read infile again and copy each set of status values to separate tmp files open INFILE, "< $infile" or warn and next; while(<INFILE>) { @@ -349,7 +365,7 @@ sub read_relative_infiles next if /^$/; # The infile must begin with the system variable values. - # Therefore, the first occurance of Aborted_clients indicates the beginning + # Therefore, the first occurrence of Aborted_clients indicates the beginning # of the first set of status values if no sets have occurred yet ($stat_n == 0). # In this case, the following status values are printed to the current fh, # along with the system variable values read thus far, until Aborted_clients @@ -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..648c95cb416 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,53 +28,41 @@ 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 + +# same for OpenSSL. Use the correct dependency +if apt-cache madison libssl-dev|grep 'libssl-dev *| *1\.1\.' >/dev/null 2>&1 +then + LIBSSL='libssl1.0-dev' +else + LIBSSL='libssl-dev' +fi +sed -i -e "s/\\\${LIBSSL}/${LIBSSL}/g" debian/control # Adjust changelog, add new version. # echo "Incrementing changelog and starting build scripts" -dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." +if [[ "$CODENAME" == bionic ]]; then + EPOCH="1:" +fi +dch -b -D ${CODENAME} -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}." -echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " +echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... " # Build the package. # Pass -I so that .git and other unnecessary temporary and source control files 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 79ccf8c8fd4..71329a870c9 100644 --- a/debian/control +++ b/debian/control @@ -1,37 +1,40 @@ -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, - libjemalloc-dev (>= 3.0.0), - libncurses5-dev (>= 5.0-6), + libaio-dev, + libarchive-dev, + libboost-dev, + libjudy-dev, + libkrb5-dev, + libncurses5-dev (>= 5.0-6~), libpam0g-dev, - libssl-dev, - libwrap0-dev (>= 7.6-8.3), + libreadline-gplv2-dev, + ${LIBSSL}, 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: https://github.com/MariaDB/server/ Vcs-Git: https://github.com/MariaDB/server.git Package: libmariadbclient18 -Section: libs Architecture: any +Section: libs Depends: libmysqlclient18 (= ${source:Version}), - mariadb-common (>= ${source:Version}), + mariadb-common, ${misc:Depends}, ${shlibs:Depends} Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), @@ -71,7 +74,7 @@ Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends} Provides: libmysqld-dev Conflicts: libmysqld-dev Replaces: libmysqld-dev -Description: MariaDB embedded database development files +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 @@ -104,7 +107,6 @@ Description: MariaDB database development files This package includes development libraries and header files. Package: mysql-common -Section: database Architecture: all Depends: ${misc:Depends}, ${shlibs:Depends} Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) @@ -117,9 +119,8 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf) (e.g. /etc/mysql/my.cnf). Package: mariadb-common -Section: database Architecture: all -Depends: mysql-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +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 @@ -129,7 +130,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) 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.0 +Package: mariadb-client-core-10.1 Architecture: any Depends: libmariadbclient18 (>= ${source:Version}), mariadb-common (>= ${source:Version}), @@ -138,11 +139,14 @@ Depends: libmariadbclient18 (>= ${source:Version}), Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-5.5, - mysql-client-core-5.6 -Conflicts: mariadb-client-5.1, + 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, @@ -153,11 +157,14 @@ Conflicts: mariadb-client-5.1, mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, - mysql-client-core-5.6 -Replaces: mariadb-client-5.1, + 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, @@ -168,7 +175,8 @@ Replaces: mariadb-client-5.1, mysql-client-5.5, mysql-client-core-5.1, mysql-client-core-5.5, - mysql-client-core-5.6 + 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 @@ -177,14 +185,14 @@ Description: MariaDB database core client binaries . This package includes the core client files, as used by Akonadi. -Package: mariadb-client-10.0 +Package: mariadb-client-10.1 Architecture: any Depends: debianutils (>=1.6), libdbd-mysql-perl (>= 1.2202), libdbi-perl, libmariadbclient18 (>= ${source:Version}), - mariadb-client-core-10.0 (>= ${source:Version}), - mariadb-common (>= ${source:Version}), + mariadb-client-core-10.1 (>= ${source:Version}), + mariadb-common, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} @@ -196,6 +204,7 @@ Provides: mysql-client, 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, @@ -204,8 +213,10 @@ Conflicts: mariadb-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, - mysql-client-5.6 + 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, @@ -214,7 +225,8 @@ Replaces: mariadb-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-5.5, - mysql-client-5.6 + 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 @@ -224,16 +236,19 @@ Description: MariaDB database client binaries This package includes the client binaries and the additional tools innotop and mysqlreport. -Package: mariadb-server-core-10.0 +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 -Conflicts: mariadb-server-core-5.1, + 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, @@ -241,8 +256,10 @@ Conflicts: mariadb-server-core-5.1, mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, - mysql-server-core-5.6 -Replaces: mariadb-server-core-5.1, + 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, @@ -250,7 +267,8 @@ Replaces: mariadb-server-core-5.1, mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, - mysql-server-core-5.6 + 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 @@ -259,22 +277,26 @@ Description: MariaDB database core server files . This package includes the core server files, as used by Akonadi. -Package: mariadb-test-10.0 -Section: database +Package: mariadb-test-10.1 Architecture: any -Depends: mariadb-client-10.0 (= ${source:Version}), - mariadb-server-10.0 (= ${source:Version}) +Depends: mariadb-client-10.1 (= ${binary:Version}), + mariadb-server-10.1 (= ${binary:Version}) Suggests: patch 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.3, + virtual-mysql-testsuite Replaces: mariadb-test (<< ${source:Version}), + mariadb-test-10.0, mariadb-test-5.1, mariadb-test-5.2, - mariadb-test-5.3 + mariadb-test-5.3, + 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 @@ -283,23 +305,34 @@ Description: MariaDB database regression test suite . This package includes the regression test suite. -Package: mariadb-server-10.0 +Package: mariadb-server-10.1 Architecture: any -Suggests: mailx, mariadb-test, tinyca +Suggests: mailx, mariadb-test, netcat-openbsd, tinyca Recommends: libhtml-template-perl -Pre-Depends: mariadb-common (>= ${source:Version}), adduser (>= 3.40), debconf +Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: bsdutils, + coreutils, + findutils, + galera-3 (>=25.3), + gawk, + grep, + iproute | iproute2, libdbi-perl, lsb-base (>= 3.0-10), - mariadb-client-10.0 (>= ${source:Version}), - mariadb-server-core-10.0 (>= ${binary:Version}), + lsof, + mariadb-client-10.1 (>= ${source:Version}), + mariadb-server-core-10.1 (>= ${binary:Version}), passwd, perl (>= 5.6), psmisc, + rsync, + socat, + 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, @@ -311,10 +344,12 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, - mysql-server-5.6 + mysql-server-5.6, + virtual-mysql-server Replaces: libmariadbclient-dev (<< 5.5.0), libmariadbclient16 (<< 5.3.4), mariadb-server (<< ${source:Version}), + mariadb-server-10.0, mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, @@ -326,7 +361,8 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, - mysql-server-5.6 + mysql-server-5.6, + 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 @@ -336,12 +372,11 @@ Description: MariaDB database server binaries This package includes the server binaries. Package: mariadb-server -Section: database Architecture: all -Depends: mariadb-server-10.0 (= ${source:Version}), ${misc:Depends} +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-server (currently mariadb-server-10.0), as determined by the MariaDB + 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. @@ -352,40 +387,69 @@ Description: MariaDB database server (metapackage depending on the latest versio 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-test -Section: database Architecture: all -Depends: mariadb-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-test (currently mariadb-test-10.0), as determined by the MariaDB + mariadb-test (currently mariadb-test-10.1), as determined by the MariaDB maintainers. -Package: mariadb-connect-engine-10.0 -Section: database +Package: mariadb-connect-engine-10.1 Architecture: any -Depends: libxml2, mariadb-server-10.0|mariadb-galera-server-10.0, unixodbc -Build-depends: libxml2-dev, - mariadb-server-10.0|mariadb-galera-server-10.0, - unixodbc-dev +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.0 -Section: database +Package: mariadb-oqgraph-engine-10.1 Architecture: any -Depends: libjudydebian1, mariadb-server-10.0|mariadb-galera-server-10.0 -Description: Oqgraph storage engine for MariaDB - The OQGRAPH engine is a computation engine plugin for handling hierarchies +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 + + +Package: mariadb-backup-10.1 +Section: database +Architecture: any +Depends: mariadb-client-core-10.1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Backup tool for MariaDB server diff --git a/debian/dist/Debian/mariadb-server-10.0.README.Debian b/debian/dist/Debian/mariadb-server-10.0.README.Debian deleted file mode 100644 index f398f2fa236..00000000000 --- a/debian/dist/Debian/mariadb-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-server-10.0.dirs b/debian/dist/Debian/mariadb-server-10.0.dirs deleted file mode 100644 index 320299b17ca..00000000000 --- a/debian/dist/Debian/mariadb-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-server-10.0 -var/run/mysqld -var/lib/mysql-upgrade diff --git a/debian/dist/Debian/mariadb-server-10.0.files.in b/debian/dist/Debian/mariadb-server-10.0.files.in deleted file mode 100644 index 9feec684ff0..00000000000 --- a/debian/dist/Debian/mariadb-server-10.0.files.in +++ /dev/null @@ -1,83 +0,0 @@ -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/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/mysqld_safe_helper -usr/bin/mysqlhotcopy -usr/bin/perror -usr/bin/replace -usr/bin/resolve_stack_dump -usr/bin/resolveip -usr/share/doc/mariadb-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-server-10.0/INFO_SRC -usr/share/doc/mariadb-server-10.0/INFO_BIN -usr/share/lintian/overrides/mariadb-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/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@ diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-server-10.0.postinst deleted file mode 100644 index 5179fd4944a..00000000000 --- a/debian/dist/Debian/mariadb-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-server-10.0.postrm b/debian/dist/Debian/mariadb-server-10.0.postrm deleted file mode 100644 index 469b1627aff..00000000000 --- a/debian/dist/Debian/mariadb-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 8366d997979..00000000000 --- a/debian/dist/Debian/rules +++ /dev/null @@ -1,284 +0,0 @@ -#!/usr/bin/make -f - -export DH_VERBOSE=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-server - install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe - mkdir -p $(TMP)/usr/share/doc/mariadb-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-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-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-server-10.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-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/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common - cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0 - cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0 - - # For 5.0 -> 10.0 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-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-server-10.0.README.Debian b/debian/dist/Ubuntu/mariadb-server-10.0.README.Debian deleted file mode 100644 index 741243f1ec3..00000000000 --- a/debian/dist/Ubuntu/mariadb-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/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files index 8f56a3065d5..a7595dceffd 100644 --- a/debian/libmariadbclient-dev.files +++ b/debian/libmariadbclient-dev.files @@ -4,4 +4,5 @@ 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/libmariadbclient18.links b/debian/libmariadbclient18.links new file mode 100644 index 00000000000..b2e8a48302f --- /dev/null +++ b/debian/libmariadbclient18.links @@ -0,0 +1,3 @@ +usr/lib/libmysqlclient.so.18.0.0 usr/lib/libmariadbclient.so.18.0.0 +usr/lib/libmysqlclient.so.18 usr/lib/libmariadbclient.so.18 +usr/lib/libmysqlclient.so usr/lib/libmariadbclient.so diff --git a/debian/mariadb-backup-10.1.files b/debian/mariadb-backup-10.1.files new file mode 100644 index 00000000000..734117c92e2 --- /dev/null +++ b/debian/mariadb-backup-10.1.files @@ -0,0 +1,2 @@ +usr/bin/mariabackup +usr/bin/mbstream diff --git a/debian/mariadb-client-10.0.lintian-overrides b/debian/mariadb-client-10.0.lintian-overrides deleted file mode 100644 index d4dc1a70b1e..00000000000 --- a/debian/mariadb-client-10.0.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -mariadb-client-5.3: package-has-a-duplicate-relation -mariadb-client-5.3: wrong-name-for-upstream-changelog usr/share/doc/mariadb-client-5.3/changelog.innotop.gz -mariadb-client-5.3: pkg-not-in-package-test innotop diff --git a/debian/mariadb-client-10.0.README.Debian b/debian/mariadb-client-10.1.README.Debian index b245638f9c9..64f0f509951 100644 --- a/debian/mariadb-client-10.0.README.Debian +++ b/debian/mariadb-client-10.1.README.Debian @@ -1,4 +1,4 @@ FAQ: -Q: My <tab> completition is gone, why? +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.0.dirs b/debian/mariadb-client-10.1.dirs index ceda5922c5d..ceda5922c5d 100644 --- a/debian/mariadb-client-10.0.dirs +++ b/debian/mariadb-client-10.1.dirs diff --git a/debian/mariadb-client-10.0.docs b/debian/mariadb-client-10.1.docs index 21446855f51..21446855f51 100644 --- a/debian/mariadb-client-10.0.docs +++ b/debian/mariadb-client-10.1.docs diff --git a/debian/mariadb-client-10.0.files b/debian/mariadb-client-10.1.files index a8a009517e6..e6033952c26 100644 --- a/debian/mariadb-client-10.0.files +++ b/debian/mariadb-client-10.1.files @@ -12,7 +12,6 @@ usr/bin/mysqlreport usr/bin/mysqlshow usr/bin/mysqlslap usr/bin/mysql_waitpid -usr/share/lintian/overrides/mariadb-client-10.0 usr/share/man/man1/innotop.1 usr/share/man/man1/mysqlaccess.1 usr/share/man/man1/mysqladmin.1 diff --git a/debian/mariadb-client-10.0.links b/debian/mariadb-client-10.1.links index 0b86e87f2e9..0b86e87f2e9 100644 --- a/debian/mariadb-client-10.0.links +++ b/debian/mariadb-client-10.1.links diff --git a/debian/mariadb-client-10.0.menu b/debian/mariadb-client-10.1.menu index 1378555c423..1378555c423 100644 --- a/debian/mariadb-client-10.0.menu +++ b/debian/mariadb-client-10.1.menu diff --git a/debian/mariadb-client-core-10.0.files b/debian/mariadb-client-core-10.1.files index a2781309439..a2781309439 100644 --- a/debian/mariadb-client-core-10.0.files +++ b/debian/mariadb-client-core-10.1.files diff --git a/debian/mariadb-connect-engine-10.0.files b/debian/mariadb-connect-engine-10.1.files index 0b042607c36..0b042607c36 100644 --- a/debian/mariadb-connect-engine-10.0.files +++ b/debian/mariadb-connect-engine-10.1.files 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-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.0.files b/debian/mariadb-oqgraph-engine-10.1.files index f67b0cd9d13..f67b0cd9d13 100644 --- a/debian/mariadb-oqgraph-engine-10.0.files +++ b/debian/mariadb-oqgraph-engine-10.1.files diff --git a/debian/mariadb-server-10.0.NEWS b/debian/mariadb-server-10.0.NEWS deleted file mode 100644 index a3042dc2918..00000000000 --- a/debian/mariadb-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-server-10.0.lintian-overrides b/debian/mariadb-server-10.0.lintian-overrides deleted file mode 100644 index ea67ed9de2b..00000000000 --- a/debian/mariadb-server-10.0.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -mariadb-server-10.0: command-with-path-in-maintainer-script postinst -mariadb-server-10.0: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}' -mariadb-server-10.0: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}' -mariadb-server-10.0: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql -mariadb-server-10.0: statically-linked-binary ./usr/sbin/mysqld 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-server-10.0.config b/debian/mariadb-server-10.1.config index 162017caf71..162017caf71 100644 --- a/debian/mariadb-server-10.0.config +++ b/debian/mariadb-server-10.1.config diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.dirs b/debian/mariadb-server-10.1.dirs index 320299b17ca..64b49db4af9 100644 --- a/debian/dist/Ubuntu/mariadb-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-server-10.0 +usr/share/doc/mariadb-server-10.1 var/run/mysqld var/lib/mysql-upgrade diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files.in b/debian/mariadb-server-10.1.files.in index a5e8bd6e717..cb935541186 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.files.in +++ b/debian/mariadb-server-10.1.files.in @@ -1,9 +1,14 @@ usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so +usr/lib/mysql/plugin/disks.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 @@ -11,11 +16,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.0.py +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 @@ -46,10 +53,15 @@ usr/bin/perror usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip -usr/share/doc/mariadb-server-10.0/mysqld.sym.gz -usr/share/doc/mariadb-server-10.0/INFO_SRC -usr/share/doc/mariadb-server-10.0/INFO_BIN -usr/share/lintian/overrides/mariadb-server-10.0 +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/bin/wsrep_sst_mariabackup +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,10 +88,15 @@ 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@ +@SYSTEMD_DEB_FILES@ diff --git a/debian/mariadb-server-10.0.logcheck.ignore.paranoid b/debian/mariadb-server-10.1.logcheck.ignore.paranoid index 00cc5c3e29d..00cc5c3e29d 100644 --- a/debian/mariadb-server-10.0.logcheck.ignore.paranoid +++ b/debian/mariadb-server-10.1.logcheck.ignore.paranoid diff --git a/debian/mariadb-server-10.0.logcheck.ignore.server b/debian/mariadb-server-10.1.logcheck.ignore.server index 37f25cb01ea..37f25cb01ea 100644 --- a/debian/mariadb-server-10.0.logcheck.ignore.server +++ b/debian/mariadb-server-10.1.logcheck.ignore.server diff --git a/debian/mariadb-server-10.0.logcheck.ignore.workstation b/debian/mariadb-server-10.1.logcheck.ignore.workstation index 37f25cb01ea..37f25cb01ea 100644 --- a/debian/mariadb-server-10.0.logcheck.ignore.workstation +++ b/debian/mariadb-server-10.1.logcheck.ignore.workstation diff --git a/debian/mariadb-server-10.0.mysql-server.logrotate b/debian/mariadb-server-10.1.mysql-server.logrotate index dbe2a7e7dfe..dbe2a7e7dfe 100644 --- a/debian/mariadb-server-10.0.mysql-server.logrotate +++ b/debian/mariadb-server-10.1.mysql-server.logrotate diff --git a/debian/mariadb-server-10.0.mysql.init b/debian/mariadb-server-10.1.mysql.init index 46911aa57a1..c15983c13d0 100644 --- a/debian/mariadb-server-10.0.mysql.init +++ b/debian/mariadb-server-10.1.mysql.init @@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) CONF=/etc/mysql/my.cnf MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -# priority can be overriden and "-s" adds output to stderr +# priority can be overridden and "-s" adds output to stderr ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" # Safeguard (relative paths, core dumps..) @@ -37,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 @@ -108,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 "." @@ -152,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 @@ -179,8 +182,15 @@ case "${1:-''}" in fi ;; + 'bootstrap') + # Bootstrap the cluster, start the first node + # that initiates the cluster + log_daemon_msg "Bootstrapping the cluster" "mysqld" + $SELF start "${@:2}" --wsrep-new-cluster + ;; + *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" + echo "Usage: $SELF start|stop|restart|reload|force-reload|status|bootstrap" exit 1 ;; esac diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/mariadb-server-10.1.postinst index e90ef045e2c..eede069ae12 100644 --- a/debian/dist/Ubuntu/mariadb-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,32 +234,12 @@ 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 -# means init.d script is disabled. Unmask mysql service explicitely. +# 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 explicitly. # 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 diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postrm b/debian/mariadb-server-10.1.postrm index 7cee5150ef9..7cee5150ef9 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.postrm +++ b/debian/mariadb-server-10.1.postrm diff --git a/debian/mariadb-server-10.0.preinst b/debian/mariadb-server-10.1.preinst index 7ad46c6ee52..1df01b2dcee 100644 --- a/debian/mariadb-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-server-10.0.prerm b/debian/mariadb-server-10.1.prerm index 03e9ea37420..03e9ea37420 100644 --- a/debian/mariadb-server-10.0.prerm +++ b/debian/mariadb-server-10.1.prerm diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.py b/debian/mariadb-server-10.1.py index b0537b4bd6b..fe5029d056c 100644 --- a/debian/dist/Ubuntu/mariadb-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-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-server-10.0.templates b/debian/mariadb-server-10.1.templates index 13943da534a..f64dd02d7bd 100644 --- a/debian/mariadb-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.0.files b/debian/mariadb-server-core-10.1.files index 5c60ca5ec67..5c60ca5ec67 100644 --- a/debian/mariadb-server-core-10.0.files +++ b/debian/mariadb-server-core-10.1.files diff --git a/debian/mariadb-test-10.0.dirs b/debian/mariadb-test-10.1.dirs index 65dbbc81c2a..b21c5b780f7 100644 --- a/debian/mariadb-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 @@ -85,9 +76,5 @@ usr/share/mysql/mysql-test/suite/oqgraph/t usr/share/mysql/mysql-test/suite/oqgraph/r usr/share/mysql/mysql-test/suite/oqgraph/include usr/share/mysql/mysql-test/std_data -usr/share/mysql/mysql-test/std_data/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-test-10.0.files b/debian/mariadb-test-10.1.files index 767f040b45a..dbb551a9407 100644 --- a/debian/mariadb-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 diff --git a/debian/mariadb-test-10.0.links b/debian/mariadb-test-10.1.links index 082680fe5ed..082680fe5ed 100644 --- a/debian/mariadb-test-10.0.links +++ b/debian/mariadb-test-10.1.links diff --git a/debian/mysql-common.files b/debian/mysql-common.files index d167569e892..c052beb0027 100644 --- a/debian/mysql-common.files +++ b/debian/mysql-common.files @@ -1,3 +1,2 @@ etc/mysql/my.cnf usr/share/mysql-common/internal-use-only -usr/share/lintian/overrides/mysql-common diff --git a/debian/mysql-common.lintian-overrides b/debian/mysql-common.lintian-overrides deleted file mode 100644 index c6c60ccdc71..00000000000 --- a/debian/mysql-common.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_init.d_mysql -script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_mysql_debian-start 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/01_MAKEFILES__Docs_Images_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch index ca138afa746..93ec7391dc0 100755 --- a/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch +++ b/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch @@ -39,7 +39,7 @@ +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + +# Process this file with automake to create Makefile.in + diff --git a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch b/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch index 6440697bc02..c560a0eea06 100755 --- a/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch +++ b/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch @@ -39,7 +39,7 @@ +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + +# Process this file with automake to create Makefile.in + 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..183212ef678 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 @@ -8,8 +8,8 @@ ## DP: http://bugs.mysql.com/bug.php?id=6901 @DPATCH@ ---- old/scripts/mysql_system_tables_data.sql 2008-12-04 22:59:44.000000000 +0100 -+++ new/scripts/mysql_system_tables_data.sql 2008-12-04 23:00:07.000000000 +0100 +--- a/scripts/mysql_system_tables_data.sql ++++ b/scripts/mysql_system_tables_data.sql @@ -26,16 +26,6 @@ -- a plain character SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname; @@ -26,14 +26,14 @@ - -- 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'); --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; - DROP TABLE tmp_user; + CREATE TEMPORARY TABLE tmp_user_nopasswd LIKE user; +@@ -48,9 +38,6 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y' + REPLACE INTO tmp_user_nopasswd 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); + -- More secure root account using unix sucket auth. + INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, '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,'unix_socket','','N', 'N','', 0); +--- Anonymous user with no privileges. +-INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost',''); +-INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; - + INSERT INTO user SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL; + INSERT INTO user SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL; diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 40b6d906195..029c650fe7a 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mariadb-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 1507fcc92ab..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "هل فعلاً تريد التثبيط؟" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "إزالة جميع قواعد بيانات MariaDB؟" #. Type: boolean #. Description -#: ../mariadb-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-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-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "تشغيل خادم MariaDB عند الإقلاع؟" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 7ca3129f3c5..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-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-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-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 453bf5fb7fa..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 e6836118840..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 3a36bf7221f..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Passwort-Eingabefehler" #. Type: error #. Description -#: ../mariadb-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-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-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 f4e729b5f90..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 e5643f1ce65..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Pasahitz sarrera errorea" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Dirudienez NDB Cluster-a erabilia dago" - -#. Type: error -#. Description -#: ../mariadb-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 da74e64a193..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "Abandon de la gestion de NDB" - -#. Type: error -#. Description -#: ../mariadb-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 30e58547e78..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 bd39afe5398..459099cbc6a 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -6,7 +6,7 @@ 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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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,51 +168,34 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-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-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 "" "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-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-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "È in uso un cluster NDB" - -#. Type: error -#. Description -#: ../mariadb-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 4cc190425f4..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "本当にダウングレードを実行しますか?" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "すべての MariaDB データベースを削除しますか?" #. Type: boolean #. Description -#: ../mariadb-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-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-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "MariaDB をシステム起動時に開始しますか?" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "パスワード入力エラー" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB クラスタが利用されているようです" - -#. Type: error -#. Description -#: ../mariadb-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 ed02ca1d48e..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-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-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 a3694f6eea0..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-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-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 4f2e646dcc7..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 7cfa5a05190..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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 a0c69e7161f..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-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-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 e1e73ee2748..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "Действительно установить более старую версию?" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "Удалить все базы данных MariaDB?" #. Type: boolean #. Description -#: ../mariadb-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-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-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "Запускать MariaDB при загрузке системы?" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "Ошибка ввода пароля" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB Cluster уже используется" - -#. Type: error -#. Description -#: ../mariadb-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 788349fa504..0cd512a252b 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -7,7 +7,7 @@ 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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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,54 +170,36 @@ msgstr "" #. Type: error #. Description -#: ../mariadb-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-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 "" -"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-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-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "NDB-kluster används inte" - -#. Type: error -#. Description -#: ../mariadb-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 b046b068ff9..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-server-10.0.templates:3001 +#: ../mariadb-server-10.1.templates:3001 msgid "Important note for NIS/YP users" msgstr "" #. Type: note #. Description -#: ../mariadb-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-server-10.0.templates:5001 +#: ../mariadb-server-10.1.templates:5001 msgid "Start the MariaDB server on boot?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-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-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-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 a648bf38698..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-server-10.0.templates:2001 +#: ../mariadb-server-10.1.templates:2001 msgid "Really proceed with downgrade?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-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-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-server-10.0.templates:4001 +#: ../mariadb-server-10.1.templates:4001 msgid "Remove all MariaDB databases?" msgstr "" #. Type: boolean #. Description -#: ../mariadb-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-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-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-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-server-10.0.templates:6001 +#: ../mariadb-server-10.1.templates:6001 msgid "New password for the MariaDB \"root\" user:" msgstr "" #. Type: password #. Description -#: ../mariadb-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-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-server-10.0.templates:7001 +#: ../mariadb-server-10.1.templates:7001 msgid "Repeat password for the MariaDB \"root\" user:" msgstr "" #. Type: error #. Description -#: ../mariadb-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-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-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-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-server-10.0.templates:9001 +#: ../mariadb-server-10.1.templates:9001 msgid "Password input error" msgstr "" #. Type: error #. Description -#: ../mariadb-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-server-10.0.templates:10001 -msgid "NDB Cluster seems to be in use" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-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 8d993124b56..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 @@ -163,43 +163,37 @@ install: build # mariadb-server install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe - mkdir -p $(TMP)/usr/share/doc/mariadb-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-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-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-server-10.0/INFO_SRC - install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-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/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common - cp debian/mariadb-server-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-10.0 - cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-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-server-10.0.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-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-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; \ @@ -247,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 |