check for MARIADB_BASE_VERSION in _exceptions.c#22
Open
pepasflo wants to merge 1 commit intopython-oursql:masterfrom
pepasflo:master
Open
check for MARIADB_BASE_VERSION in _exceptions.c#22pepasflo wants to merge 1 commit intopython-oursql:masterfrom pepasflo:master
pepasflo wants to merge 1 commit intopython-oursql:masterfrom
pepasflo:master
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Debian Stretch appears to ship with MariaDB rather than MySQL.
MariaDB's
mysqld_error.hdoes not defineerrmsg_section_start, which causespip install oursqlto fail:However, oursql has an alternative code path which does not use
errmsg_section_size, which I think can be used for Maria DB.The problem is that Maria DB defines
MYSQL_VERSION_ID, which causes the#if MYSQL_VERSION_ID >= 50700code branch to get used.I think we can simply extend that predicate with
&& !defined(MARIADB_BASE_VERSION), which will cause Maria DB to use the alternative code path.Note that I haven't tested this, as I'm not sure how to make a pip module rebuild with my local changes.