Skip to content

Method for loading .my.cnf file is changed from "defaults-file" to "defaults-extra-file" (mysql option)#367

Merged
apenney merged 2 commits intopuppetlabs:masterfrom
w32-blaster:master
Nov 12, 2013
Merged

Method for loading .my.cnf file is changed from "defaults-file" to "defaults-extra-file" (mysql option)#367
apenney merged 2 commits intopuppetlabs:masterfrom
w32-blaster:master

Conversation

@w32-blaster
Copy link
Contributor

The providers should load the .my.cnf file with "--defaults-extra-file" instead of "--defaults-file". This is necessary if we have global my.cnf file but we want to use both of them.

@igalic
Copy link
Contributor

igalic commented Nov 11, 2013

This is a good idea, however, you will need to adapt the failing tests.
Also, once done, please squash those three commits into one (or two, where the second is fixing the failing tests)

Should load the .my.cnf file with "--defaults-extra-file" instead of "--defaults-file". This is necessary if we have global my.cnf file but we want to use both of them.
@w32-blaster
Copy link
Contributor Author

Changes are done. Can you merge it now?

Tamas

@igalic
Copy link
Contributor

igalic commented Nov 12, 2013

@w32-blaster
Copy link
Contributor Author

And a new try ...
I just realized that the old (database_*) providers was still with the defaults-file. Now I have fixed that too.

@igalic
Copy link
Contributor

igalic commented Nov 12, 2013

ugh... we should create an issue for that, they are deprecated.

@igalic
Copy link
Contributor

igalic commented Nov 12, 2013

can you please squash the last two commits please?

@apenney
Copy link
Contributor

apenney commented Nov 12, 2013

Nice! Any chance you can squash your commits down so we just have 1-2? Once that's done I'll get this tested and merged. Thanks!

Added "require" to the global mysql.rb file like in the other provider files.

defaults-file changed to defaults-extra-file in all the database_* (old) providers, the same as in the mysql_* providers.

Changed defaults-file to defaults-extra-file in all test files
@w32-blaster
Copy link
Contributor Author

Done

apenney pushed a commit that referenced this pull request Nov 12, 2013
Method for loading .my.cnf file is changed from "defaults-file" to "defaults-extra-file" (mysql option)
@apenney apenney merged commit 2995211 into puppetlabs:master Nov 12, 2013
@apenney
Copy link
Contributor

apenney commented Nov 12, 2013

Thanks for this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants