Minimal required changes to make it work for mariadb 10.2 #857
Conversation
Updated extconf.rb to check if we have the header Update mysql2_ext.h to load it if the def is set Signed-off-by: Scott M. Likens <[email protected]>
ext/mysql2/extconf.rb
Outdated
| # MariaDB 10.2+ Needs mysql/mysql_version.h loaded to get the constants we need | ||
| have_header('mysql/mysql_version.h') | ||
|
|
||
|
|
There was a problem hiding this comment.
Looks good - nit: please move to line 114, and use the prefix variable from the path test at line 100.
There was a problem hiding this comment.
I removed this as if we are just using the original ifdef we don't need to check against this?
ext/mysql2/mysql2_ext.h
Outdated
| @@ -20,6 +20,9 @@ void Init_mysql2(void); | |||
| #include <mysql/errmsg.h> | |||
| #include <mysql/mysqld_error.h> | |||
| #endif | |||
| #ifdef HAVE_MYSQL_MYSQL_VERSION_H | |||
| #include <mysql/mysql_version.h> | |||
| #endif | |||
There was a problem hiding this comment.
At the risk of a too many combinations, should this also be conditional on the mysql/ prefix as above?
There was a problem hiding this comment.
Is this configuration file available always in other conditions? it looks like yes
I updated it so it matches both possibilities.
Signed-off-by: Scott M. Likens <[email protected]>
|
I also checked that mysql_version.h is always available in the MySQL Connector/C and MariaDB Connector/C distributions. |
|
Here's some background on the issue: https://jira.mariadb.org/browse/MDEV-13370 I think upstream's intent is that you shouldn't have to do explicit includes like this (and note that having that include will prevent the project from building against mariadb-connector-c 3.x; the header does not exist in that version). If I'm reading what they're telling me right, I think they must either add I haven't yet been able to find any clear documentation of what interfaces / definitions / etc. are intended to be lost in this rather poorly-explained switch to including |
…#857) Always include mysql_version.h Signed-off-by: Scott M. Likens <[email protected]>
Updated extconf.rb to check if we have the header
Update mysql2_ext.h to load it if the def is set
Signed-off-by: Scott M. Likens [email protected]
Refs #851