Skip to content
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

CRM-21687 fix issue with MariaDB 10.2 logging query writing due to cu… #11580

Merged
merged 1 commit into from
Jan 24, 2018

Conversation

seamuslee001
Copy link
Contributor

…rrent_timestamp and timestamp getting () added on the end in Maria10.2

Overview

In MariaDB 10.2 CURRENT_TIMESTAMP and TIMESTAMP get () added on at the end of the definition. This is my take on it following testing locally on a 10.2 Maria DB. i used str_ireplace as it seemed safer and more consistent with our current practices.

Before

Logging would not be able to be enabled on Maria10.2

After

Logging is able to be enabled

ping @gah242s @eileenmcnaughton @mlutfy @mattwire This has worked locally for me on a dmaster build. I have also tried added a unit test of the query writing hence the change to static function but that may have issues.

…rrent_timestamp and timestamp getting () added on the end in Maria10.2
@eileenmcnaughton
Copy link
Contributor

seems ok - are you able to test @gah242s

@gah242s
Copy link
Contributor

gah242s commented Jan 24, 2018

Got this after rolling back and running upgrade again.

Congratulations! Your upgrade was successful!

Looks good from this standpoint.

@eileenmcnaughton
Copy link
Contributor

OK - I'm happy that this passed your testing & the unit test gives me confidence. Merging

@eileenmcnaughton
Copy link
Contributor

thanks @seamuslee001

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants