diff --git a/bin/pt-archiver b/bin/pt-archiver index 3a93c65b..94b62c28 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -5822,7 +5822,7 @@ sub main { } foreach my $thing ( $first_sql, $next_sql ) { - $thing .= " ORDER BY $index_cols " if $index_cols; + $thing .= " ORDER BY $index_cols" if $index_cols; $thing .= " LIMIT $limit"; if ( $o->get('for-update') ) { $thing .= ' FOR UPDATE'; diff --git a/t/pt-archiver/indexes.t b/t/pt-archiver/indexes.t index bb698950..2f19d5d8 100644 --- a/t/pt-archiver/indexes.t +++ b/t/pt-archiver/indexes.t @@ -97,7 +97,7 @@ is($output, '', "No output when --no-ascend"); # Check ascending only first column $output = `$cmd --where 1=1 --dry-run --ascend-first --source D=test,t=table_5,F=$cnf --purge --limit 50 2>&1`; -like ( $output, qr/WHERE \(1=1\) AND \(\(`a` >= \?\)\) ORDER BY `a`,`b`,`c`,`d` LIMIT/, 'Can ascend just first column'); +like ( $output, qr/WHERE \(1=1\) AND \(\(`a` >= \?\)\) ORDER BY `a`,`b`,`c`,`d` LIMIT/, 'Can ascend just first column'); # ############################################################################# # Done. diff --git a/t/pt-archiver/samples/issue-248.txt b/t/pt-archiver/samples/issue-248.txt index bd2b0cfd..ae49cb32 100644 --- a/t/pt-archiver/samples/issue-248.txt +++ b/t/pt-archiver/samples/issue-248.txt @@ -1,3 +1,3 @@ -SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') ORDER BY `film_id` LIMIT 1 -SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') AND ((`film_id` >= ?)) ORDER BY `film_id` LIMIT 1 +SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') ORDER BY `film_id` LIMIT 1 +SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') AND ((`film_id` >= ?)) ORDER BY `film_id` LIMIT 1 DELETE FROM `sakila`.`film` WHERE (`film_id` = ?)