fixed character-set detection regex #133

Merged
merged 1 commit into from Jan 9, 2013

Projects

None yet

2 participants

@obilodeau
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).

@obilodeau obilodeau fixed character-set detection regex
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.
8510a41
@obilodeau
Contributor

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 hunner merged commit 4af7950 into puppetlabs:master Jan 9, 2013

1 check failed

default The Travis build failed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment