Skip to content

Commit 1bec1fd

Browse files
committed
Remove unused variable force_concat_enums
- Removed variable - Adjusted utils/update-modules, so it does not process symlinks
1 parent ce20bc7 commit 1bec1fd

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

bin/pt-online-schema-change

-2
Original file line numberDiff line numberDiff line change
@@ -5862,8 +5862,6 @@ sub _nibble_params {
58625862
);
58635863
PTDEBUG && _d('Ascend params:', Dumper($asc));
58645864

5865-
my $force_concat_enums;
5866-
58675865

58685866
my $from = "$tbl->{name} FORCE INDEX(`$index`)";
58695867
my $order_by = join(', ', map {$q->quote($_)} @{$index_cols});

bin/pt-table-checksum

-2
Original file line numberDiff line numberDiff line change
@@ -6683,8 +6683,6 @@ sub _nibble_params {
66836683
);
66846684
PTDEBUG && _d('Ascend params:', Dumper($asc));
66856685

6686-
my $force_concat_enums;
6687-
66886686

66896687
my $from = "$tbl->{name} FORCE INDEX(`$index`)";
66906688
my $order_by = join(', ', map {$q->quote($_)} @{$index_cols});

lib/NibbleIterator.pm

-4
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,6 @@ sub _nibble_params {
208208
);
209209
PTDEBUG && _d('Ascend params:', Dumper($asc));
210210

211-
# Check if enum fields items are sorted or not.
212-
# If they are sorted we can skip adding CONCAT to improve the queries eficiency.
213-
my $force_concat_enums;
214-
215211
# Make SQL statements, prepared on first call to next(). FROM and
216212
# ORDER BY are the same for all statements. FORCE IDNEX and ORDER BY
217213
# are needed to ensure deterministic nibbling.

util/update-modules

+4
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ if [ ! -f $tool_file ]; then
137137
die "$tool_file does not exist"
138138
fi
139139

140+
if [ -h $tool_file ]; then
141+
die "$tool_file is a symbolic link"
142+
fi
143+
140144
if [ -n "$(head -n 1 $tool_file | grep perl)" ]; then
141145
tool_lang="perl"
142146
else

0 commit comments

Comments
 (0)