diff --git a/bin/pt-archiver b/bin/pt-archiver index 843e0614..a5b1a461 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -2120,12 +2120,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -2141,7 +2135,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker index c6fd8967..381f3b30 100755 --- a/bin/pt-duplicate-key-checker +++ b/bin/pt-duplicate-key-checker @@ -504,12 +504,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -525,7 +519,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-find b/bin/pt-find index 167bed8a..85a9c94d 100755 --- a/bin/pt-find +++ b/bin/pt-find @@ -2067,12 +2067,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -2088,7 +2082,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat index ab556086..6733c000 100755 --- a/bin/pt-heartbeat +++ b/bin/pt-heartbeat @@ -3941,12 +3941,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -3962,7 +3956,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-index-usage b/bin/pt-index-usage index 554dbf34..e135fa43 100755 --- a/bin/pt-index-usage +++ b/bin/pt-index-usage @@ -3319,12 +3319,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -3340,7 +3334,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-kill b/bin/pt-kill index 71aef999..604e906b 100755 --- a/bin/pt-kill +++ b/bin/pt-kill @@ -3190,12 +3190,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -3211,7 +3205,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 40903503..4b2fbdc1 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -3509,12 +3509,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -3530,7 +3524,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-query-digest b/bin/pt-query-digest index 913acf70..bf51c82b 100755 --- a/bin/pt-query-digest +++ b/bin/pt-query-digest @@ -9070,12 +9070,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -9091,7 +9085,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum index e6e2d766..7493e347 100755 --- a/bin/pt-table-checksum +++ b/bin/pt-table-checksum @@ -4703,12 +4703,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -4724,7 +4718,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-table-sync b/bin/pt-table-sync index fb8afcb3..18b56910 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -3047,12 +3047,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -3068,7 +3062,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/bin/pt-table-usage b/bin/pt-table-usage index 56372fbc..eeb25ca7 100755 --- a/bin/pt-table-usage +++ b/bin/pt-table-usage @@ -7057,12 +7057,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -7078,7 +7072,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; } diff --git a/lib/TableParser.pm b/lib/TableParser.pm index c6c05ec4..46532558 100644 --- a/lib/TableParser.pm +++ b/lib/TableParser.pm @@ -341,12 +341,6 @@ sub check_table { return 0; } - PTDEBUG && _d("lower_case_table_names=$lower_case_table_names"); - if ($lower_case_table_names > 0) { - PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase"); - $tbl = lc $tbl; - } - my $db_tbl = $q->quote($db, $tbl); PTDEBUG && _d('Checking', $db_tbl); @@ -362,7 +356,9 @@ sub check_table { $self->{check_table_error} = $e; return 0; } - if ( !$row->[0] || $row->[0] ne $tbl ) { + if ( !$row->[0] + || ( $lower_case_table_names == 0 && $row->[0] ne $tbl ) + || ( $lower_case_table_names > 0 && lc $row->[0] ne lc $tbl ) ) { PTDEBUG && _d('Table does not exist'); return 0; }