percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-20 09:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged fix-1007938-mysqlconfig-eol-comments and fixed it to only take # as a start of comment, and to respect quoted values

Browse Source
This commit is contained in:
Brian Fraser
2012-08-02 12:21:59 -03:00
parent cc3826f665 d387b22c07
commit fdb81f763d
4 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/MySQLConfig.pm
View File

@@ -337,7 +337,7 @@ sub _parse_varvals {
ITEM:
foreach my $item ( @varvals ) {
if ( $item ) {
# Strip leading and trailing whitespace.
# Strip leading and trailing whitespace, and trailing comments.
$item =~ s/^\s+//;
$item =~ s/\s+$//;
}
@@ -350,6 +350,9 @@ sub _parse_varvals {
# but in SHOW VARIABLES they're all like "log_bin".
$var =~ s/-/_/g;
# Remove trailing comments
$var =~ s/\s*#.*$//;
# The var is a duplicate (in the bad sense, i.e. where user is
# probably unaware that there's two different values for this var
# but only the last is used) if we've seen it already and it cannot
@@ -371,13 +374,22 @@ sub _parse_varvals {
$val = '';
}
else {
$val =~ s/
\A # Start of value
(['"]) # Opening quote
(.*) # Value
\1 # Closing quote
[\n\r]*\z # End of value
/$2/x;
my $quote_re = qr/
\A # Start of value
(['"]) # Opening quote
(.*) # Value
\1 # Closing quote
\s*(?:\#.*)? # End of line comment
[\n\r]*\z # End of value
/x;
if ( $val =~ $quote_re ) {
# If it matches the quote re, then $2 holds the value
$val = $2;
}
else {
# Otherwise, remove possible trailing comments
$val =~ s/\s*#.*//;
}
if ( my ($num, $factor) = $val =~ m/(\d+)([KMGT])b?$/i ) {
# value is a size like 1k, 16M, etc.
my %factor_for = (