Skip to content

fixed character-set detection regex #133

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

Merged
merged 1 commit into from
Jan 9, 2013
Merged

Conversation

obilodeau
Copy link
Contributor

Previous regex matched COLLATE value instead of CHARACTER SET. For example:

CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin */

Returned utf8_bin instead of utf8 causing an unfortunate database refresh in my configuration. Fixed the regex by adding the optional presence of the COLLATE keyword.

Tested to make sure that it worked on both cases (w/ and w/o COLLATE).

Previous regex matched COLLATE value instead of CHARACTER SET. For
example:

> CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin */

Returned utf8_bin instead of utf8 causing an unfortunate database refresh in my
configuration. Fixed the regex by adding the optional presence of the COLLATE
keyword.
@obilodeau
Copy link
Contributor Author

For the record, the build problem isn't my code's fault:

I'm sorry but an error occured within Travis while running your build. We are continuosly working on test run stability, please email support@travis-ci.org if this error persists.

hunner added a commit that referenced this pull request Jan 9, 2013
fixed character-set detection regex
@hunner hunner merged commit 4af7950 into puppetlabs:master Jan 9, 2013
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.

3 participants