This repository was archived by the owner on Mar 26, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,9 @@ static VALUE rb_hash_dup(VALUE other) {
54
54
* variable to use, but MYSQL_SERVER_VERSION gives the correct numbers when
55
55
* linking against the server itself
56
56
*/
57
- #ifdef LIBMYSQL_VERSION
57
+ #if defined(MARIADB_CLIENT_VERSION_STR )
58
+ #define MYSQL_LINK_VERSION MARIADB_CLIENT_VERSION_STR
59
+ #elif defined(LIBMYSQL_VERSION )
58
60
#define MYSQL_LINK_VERSION LIBMYSQL_VERSION
59
61
#else
60
62
#define MYSQL_LINK_VERSION MYSQL_SERVER_VERSION
@@ -1297,6 +1299,10 @@ void init_mysql2_client() {
1297
1299
#ifdef CLIENT_LONG_PASSWORD
1298
1300
rb_const_set (cMysql2Client , rb_intern ("LONG_PASSWORD" ),
1299
1301
LONG2NUM (CLIENT_LONG_PASSWORD ));
1302
+ #else
1303
+ /* HACK because MariaDB 10.2 no longer defines this constant,
1304
+ * but we're using it in our default connection flags. */
1305
+ rb_const_set (cMysql2Client , rb_intern ("LONG_PASSWORD" ), INT2NUM (0 ));
1300
1306
#endif
1301
1307
1302
1308
#ifdef CLIENT_FOUND_ROWS
Original file line number Diff line number Diff line change @@ -15,12 +15,10 @@ typedef unsigned int uint;
15
15
16
16
#ifdef HAVE_MYSQL_H
17
17
#include <mysql.h>
18
- #include <mysql_com.h>
19
18
#include <errmsg.h>
20
19
#include <mysqld_error.h>
21
20
#else
22
21
#include <mysql/mysql.h>
23
- #include <mysql/mysql_com.h>
24
22
#include <mysql/errmsg.h>
25
23
#include <mysql/mysqld_error.h>
26
24
#endif
You can’t perform that action at this time.
0 commit comments