Skip to content

Add support for 'mysql_clear_password - continued #2327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Revert flag merging to use blacklist
  • Loading branch information
ZJONSSON committed Mar 29, 2020
commit 63f6bfe6e5679bee5fc43a64267cc526087edddd
2 changes: 1 addition & 1 deletion lib/ConnectionConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ConnectionConfig.mergeFlags = function mergeFlags(defaultFlags, userFlags) {

// Merge the new flags
for (var flag in newFlags) {
if (allFlags[flag] !== newFlags[flag]) {
if (allFlags[flag] !== false) {
allFlags[flag] = newFlags[flag];
}
}
Expand Down