Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1099836-pt-osc-mariadb-2.1.9 into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

Missing updated sandbox/start-sandbox that can start MariaDB?

Let's add back this comment too:

26 + # Error: 1062 SQLSTATE: 23000 ( ER_DUP_ENTRY )
27 + # Message: Duplicate entry '%ld' for key '%s'
28 + # MariaDB 5.5.28+ has this as a warning; See https://bugs.launchpad.net/percona-toolkit/+bug/1099836

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/fix-1099836-pt-osc-mariadb-2.1.9]

525. By Brian Fraser on 2013-01-30

Re-added comments to the skipped MariaDB warning in pt-osc, and ported back the changes to enable MariaDB sandboxes

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2013-01-30 15:04:19 +0000
+++ bin/pt-online-schema-change	2013-01-30 16:02:23 +0000
@@ -3270,7 +3270,7 @@
       die "I need a $arg argument" unless $args{$arg};
    }
    my ($dbh, $db, $tbl) = @args{@required_args};
-   my $q      = $self->{Quoter};
+   my $q      = $self->{Quoter} || 'Quoter';
    my $db_tbl = $q->quote($db, $tbl);
    PTDEBUG && _d('Checking', $db_tbl);
 
@@ -9777,6 +9777,10 @@
       # Ignore this warning because we have purposely set statement-based
       # replication.
       1592 => 1,
+      # Error: 1062 SQLSTATE: 23000 ( ER_DUP_ENTRY )
+      # Message: Duplicate entry '%ld' for key '%s'
+      # MariaDB 5.5.28+ has this as a warning; See https://bugs.launchpad.net/percona-toolkit/+bug/1099836
+      1062 => 1,
    );
          
    # Warn once per-table for these error codes if the error message
@@ -9851,6 +9855,7 @@
                            . "Specify --statistics to see a count of all "
                            . "suppressed warnings and errors.\n";
                   }
+                  warn $err;
                }
             }
             else {

=== modified file 'lib/TableParser.pm'
--- lib/TableParser.pm	2013-01-03 00:19:16 +0000
+++ lib/TableParser.pm	2013-01-30 16:02:23 +0000
@@ -302,7 +302,7 @@
       die "I need a $arg argument" unless $args{$arg};
    }
    my ($dbh, $db, $tbl) = @args{@required_args};
-   my $q      = $self->{Quoter};
+   my $q      = $self->{Quoter} || 'Quoter';
    my $db_tbl = $q->quote($db, $tbl);
    PTDEBUG && _d('Checking', $db_tbl);
 

=== modified file 'sandbox/start-sandbox'
--- sandbox/start-sandbox	2012-12-21 12:45:30 +0000
+++ sandbox/start-sandbox	2013-01-30 16:02:23 +0000
@@ -27,6 +27,13 @@
    fi
 }
 
+mysql_upgrade_on() {
+   local cnf_file="$1"
+   local upgrade="$(which mysql_upgrade)"
+
+   $upgrade --defaults-file=$cnf_file --skip-write-binlog
+}
+
 make_sandbox() {
    # Make the sandbox dir and extract the base files.
    rm -rf /tmp/$port || die "Failed to rm /tmp/$port"
@@ -138,6 +145,10 @@
    /tmp/$port/use -e "CREATE TABLE IF NOT EXISTS percona_test.sentinel (id INT PRIMARY KEY, ping VARCHAR(64) NOT NULL DEFAULT '')";
    /tmp/$port/use -e "REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')";
 
+   if [ -n "${MYSQL_UPGRADE:-""}" ]; then
+      mysql_upgrade_on /tmp/$port/my.sandbox.cnf
+   fi
+
    # If the sandbox is a slave, start the slave.
    if [ "$type" = "slave" ]; then
       /tmp/$port/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=$master_port"