Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

Fixes to give a clean git status after an unmodified build.#97

Merged
jkedgar merged 2 commits into
facebook:webscalesql-5.6.24.97from
gdbentley:webscalesql-5.6.24.97-gitclean
Jun 2, 2016
Merged

Fixes to give a clean git status after an unmodified build.#97
jkedgar merged 2 commits into
facebook:webscalesql-5.6.24.97from
gdbentley:webscalesql-5.6.24.97-gitclean

Conversation

@gdbentley

Copy link
Copy Markdown

These changes make it so that "git status" still reports clean after a build. I've removed a file that is auto-generated (and diffs from the version in the repo).

@jkedgar

jkedgar commented Nov 10, 2015

Copy link
Copy Markdown
Contributor

@gdbentley, after reviewing your pull request, I can't approve it as it is. The include/probes_mysql_nodtrace.h file is an Oracle file (upstream from us) and so it should be fixed by Oracle. I would recommend you submit that part of the pull request to them. Once they release it we would automatically get the change once we switched to whatever version they release it in.

If we start making these kinds of changes to MySQL we make our own rebases down the line more complicated.

The other change (adding '*.o' to the .gitignore) file would be fine and if you want to create a separate pull request for that I'll approve it.

@gdbentley

Copy link
Copy Markdown
Author

@jkedgar I've changed the pull request to only include the .gitignore changes.

@jkedgar jkedgar merged commit 9fb353f into facebook:webscalesql-5.6.24.97 Jun 2, 2016
@jkedgar

jkedgar commented Jun 2, 2016

Copy link
Copy Markdown
Contributor

@gdbentley, I just noticed that your pull request went into 5.6.24.97. We are no longer actively developing on that branch. You may want to re-issue your pull request on 5.6.27.75.

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

3 participants