Skip to content

Commit 2619550

Browse files
committed
Fix building agains pre mysql 5.7
1 parent 1ebdaba commit 2619550

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

driver/mysql_connection_options.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ enum MySQL_Connection_Options
5454
MYSQL_ENABLE_CLEARTEXT_PLUGIN,
5555
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
5656
MYSQL_OPT_SSL_ENFORCE,
57+
#if LIBMYSQL_VERSION_ID > 50700
5758
MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
5859
MYSQL_OPT_TLS_VERSION,
5960
MYSQL_OPT_SSL_MODE
61+
#endif //LIBMYSQL_VERSION_ID > 50700
6062
};
6163

6264
}

driver/mysql_resultbind.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ static struct st_buffer_size_type
8686
case MYSQL_TYPE_BLOB:
8787
case MYSQL_TYPE_STRING:
8888
case MYSQL_TYPE_VAR_STRING:
89+
#if LIBMYSQL_VERSION_ID > 50700
8990
case MYSQL_TYPE_JSON:
9091
return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
92+
#endif //LIBMYSQL_VERSION_ID > 50700
9193

9294
case MYSQL_TYPE_DECIMAL:
9395
case MYSQL_TYPE_NEWDECIMAL:

driver/mysql_util.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
431431
return sql::DataType::SET;
432432
case MYSQL_TYPE_GEOMETRY:
433433
return sql::DataType::GEOMETRY;
434+
#if LIBMYSQL_VERSION_ID > 50700
434435
case MYSQL_TYPE_JSON:
435436
return sql::DataType::JSON;
437+
#endif //LIBMYSQL_VERSION_ID > 50700
436438
default:
437439
return sql::DataType::UNKNOWN;
438440
}
@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my
645647
return "SET";
646648
case MYSQL_TYPE_GEOMETRY:
647649
return "GEOMETRY";
650+
#if LIBMYSQL_VERSION_ID > 50700
648651
case MYSQL_TYPE_JSON:
649652
return "JSON";
653+
#endif //LIBMYSQL_VERSION_ID > 50700
650654
default:
651655
return "UNKNOWN";
652656
}

0 commit comments

Comments
 (0)