Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6058715

Browse filesBrowse files
friscoMadmethane
authored andcommitted
Fix compile with MariaDB 10.2.8 (PyMySQL#200)
1 parent 823e56a commit 6058715
Copy full SHA for 6058715

File tree

Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed

‎_mysql.c

Copy file name to clipboardExpand all lines: _mysql.c
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ _mysql_escape_string(
10391039
if (self && PyModule_Check((PyObject*)self))
10401040
self = NULL;
10411041
if (self && self->open) {
1042-
#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
1042+
#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
10431043
len = mysql_real_escape_string_quote(&(self->connection), out, in, size, '\'');
10441044
#else
10451045
len = mysql_real_escape_string(&(self->connection), out, in, size);
@@ -1097,7 +1097,7 @@ _mysql_string_literal(
10971097
out = PyBytes_AS_STRING(str);
10981098
check_server_init(NULL);
10991099
if (self && self->open) {
1100-
#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
1100+
#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
11011101
len = mysql_real_escape_string_quote(&(self->connection), out+1, in, size, '\'');
11021102
#else
11031103
len = mysql_real_escape_string(&(self->connection), out+1, in, size);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.