Merged
Conversation
PR vitessio#4814 introduced a regression where the base config would override charset and flags even if the base config values for those were not specified. This change checks for those values before overriding them. Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
dasl-
reviewed
May 23, 2019
|
|
||
| uc.param.Charset = baseConfig.Charset | ||
| uc.param.Flags = baseConfig.Flags | ||
| if baseConfig.Charset != "" { |
Member
There was a problem hiding this comment.
it seems like the default baseConfig.Charset is utf8: https://github.com/planetscale/vitess/blob/65138f200afdf5d427e415dde9e22be5d5340f7d/go/vt/dbconfigs/dbconfigs.go#L97
Won't this only work if people override the baseConfig.Charset to be the empty string? I'd imagine most people who are using userconfig charsets are not overriding baseConfig.Charset to be the empty string?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@dasl @rafael @eeSeeGee @brirams
Fixes #4870
PR #4814 introduced a regression where the base config would
override charset and flags even if the base config values for
those were not specified.
This change checks for those values before overriding them.
Signed-off-by: Sugu Sougoumarane ssougou@gmail.com