diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2016-10-16 13:30:56 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2016-10-16 13:30:56 +0000 |
| commit | 51c8d73184c3f56c1e1d3131c58ad08ffc169c92 (patch) | |
| tree | 983d0a053b7a485ef39432c0b4895b580283a554 /databases/mysql-connector-c++/files | |
| parent | www/py-django-allauth: update 0.27.0 -> 0.28.0 (diff) | |
databases/mysql-conector-c++: Fix build in 11.0 and later [1]
- Make patches makepatch compatible
PR: 213346 [1]
Submitted by: supportme@ukr.net [1]
Notes
Notes:
svn path=/head/; revision=424061
Diffstat (limited to 'databases/mysql-connector-c++/files')
3 files changed, 36 insertions, 36 deletions
diff --git a/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp b/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp new file mode 100644 index 000000000000..4e7c14c21e8d --- /dev/null +++ b/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp @@ -0,0 +1,12 @@ +--- driver/mysql_resultbind.cpp.orig 2016-01-12 18:42:38 UTC ++++ driver/mysql_resultbind.cpp +@@ -86,7 +86,9 @@ static struct st_buffer_size_type + case MYSQL_TYPE_BLOB: + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_VAR_STRING: ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: ++#endif + return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type); + + case MYSQL_TYPE_DECIMAL: diff --git a/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp b/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp new file mode 100644 index 000000000000..d33afe8049b7 --- /dev/null +++ b/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp @@ -0,0 +1,24 @@ +--- driver/mysql_util.cpp.orig 2016-01-12 18:42:38 UTC ++++ driver/mysql_util.cpp +@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD + return sql::DataType::SET; + case MYSQL_TYPE_GEOMETRY: + return sql::DataType::GEOMETRY; ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: + return sql::DataType::JSON; ++#endif + default: + return sql::DataType::UNKNOWN; + } +@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD * + return "SET"; + case MYSQL_TYPE_GEOMETRY: + return "GEOMETRY"; ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: + return "JSON"; ++#endif + default: + return "UNKNOWN"; + } diff --git a/databases/mysql-connector-c++/files/patch-optional-json b/databases/mysql-connector-c++/files/patch-optional-json deleted file mode 100644 index dea4b21fb0dc..000000000000 --- a/databases/mysql-connector-c++/files/patch-optional-json +++ /dev/null @@ -1,36 +0,0 @@ -The newly-added JSON-support may not be available in the older -version of MySQL client-library against which this connector may -be building. Fortunately, that's easy to detect at compile time... - - -mi - ---- driver/mysql_resultbind.cpp 2016-01-12 13:42:38.000000000 -0500 -+++ driver/mysql_resultbind.cpp 2016-01-24 03:58:18.451886000 -0500 -@@ -87,5 +87,7 @@ - case MYSQL_TYPE_STRING: - case MYSQL_TYPE_VAR_STRING: -+#ifdef MYSQL_TYPE_JSON - case MYSQL_TYPE_JSON: -+#endif - return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type); - ---- driver/mysql_util.cpp 2016-01-12 13:42:38.000000000 -0500 -+++ driver/mysql_util.cpp 2016-01-24 04:01:04.499990000 -0500 -@@ -432,6 +432,8 @@ - case MYSQL_TYPE_GEOMETRY: - return sql::DataType::GEOMETRY; -+#ifdef MYSQL_TYPE_JSON - case MYSQL_TYPE_JSON: - return sql::DataType::JSON; -+#endif - default: - return sql::DataType::UNKNOWN; -@@ -646,6 +648,8 @@ - case MYSQL_TYPE_GEOMETRY: - return "GEOMETRY"; -+#ifdef MYSQL_TYPE_JSON - case MYSQL_TYPE_JSON: - return "JSON"; -+#endif - default: - return "UNKNOWN"; |