percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-06 12:27:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' into PT-139

Browse Source
This commit is contained in:
Carlos Salguero
2017-05-22 14:13:42 -03:00
parent 820448fca3 43b50f8a8c
commit fc4b3a73ee
20 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-archiver
View File

@@ -45,7 +45,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-config-diff
View File

@@ -43,7 +43,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-deadlock-logger
View File

@@ -42,7 +42,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-diskstats
View File

@@ -38,7 +38,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-duplicate-key-checker
View File

@@ -39,7 +39,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-find
View File

@@ -35,7 +35,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-fk-error-logger
View File

@@ -37,7 +37,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-heartbeat
View File

@@ -44,7 +44,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-index-usage
View File

@@ -45,7 +45,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-kill
View File

@@ -47,7 +47,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

11
bin/pt-online-schema-change
View File

@@ -55,7 +55,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';
@@ -10073,8 +10073,13 @@ sub find_renamed_cols {
/x;
my $table_ident = qr/$unquoted_ident|`$quoted_ident`|"$ansi_quotes_ident"/;
my $alter_change_col_re = qr/\bCHANGE \s+ (?:COLUMN \s+)? (?:COMMENT\s+[^\]['"].*?[^\]['"])?
($table_ident) \s+ ($table_ident)/ix;
# remove comments
$alter =~ s/^(.*?)\s+COMMENT\s+'(.*?[^\\]')+(.*)/$1$3/;
$alter =~ s/^(.*?)\s+COMMENT\s+"(.*?[^\\]")+(.*)/$1$3/;
my $alter_change_col_re = qr/\bCHANGE \s+ (?:COLUMN \s+)?
($table_ident) \s+ ($table_ident)/ix;
my %renames;
while ( $alter =~ /$alter_change_col_re/g ) {

2
bin/pt-query-digest
View File

@@ -64,7 +64,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-slave-delay
View File

@@ -40,7 +40,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-slave-restart
View File

@@ -41,7 +41,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-table-checksum
View File

@@ -57,7 +57,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-table-sync
View File

@@ -55,7 +55,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-upgrade
View File

@@ -61,7 +61,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
bin/pt-variable-advisor
View File

@@ -44,7 +44,7 @@ BEGIN {
{
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

2
lib/Percona/Toolkit.pm
View File

@@ -18,7 +18,7 @@
# ###########################################################################
package Percona::Toolkit;
our $VERSION = '3.0.2';
our $VERSION = '3.0.3';
use strict;
use warnings FATAL => 'all';

4
t/pt-online-schema-change/bugs.t
View File

@@ -610,7 +610,7 @@ $sb->load_file('master', "$sample/bug-1613915.sql");
$output = output(
sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
'--execute',
'--alter', "ADD COLUMN c INT COMMENT 'change plus more than one word'",
'--alter', "ADD COLUMN c INT COMMENT 'change \"plus\" more than one word'",
'--chunk-size', '10', '--no-check-alter',
),
},
@@ -633,7 +633,7 @@ is(
$rows = $master_dbh->selectrow_arrayref("SHOW CREATE TABLE test.o1");
like(
$rows->[1],
qr/COMMENT 'change plus more than one word'/,
qr/COMMENT 'change "plus" more than one word'/,
"recognize comments",
);