diff options
3 files changed, 5 insertions, 99 deletions
diff --git a/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch b/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch deleted file mode 100644 index c2ce82d6f2..0000000000 --- a/libraries/mysql-connector-c++/mysql-connector-c++-no-JSON.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/cppconn/datatype.h b/cppconn/datatype.h -index 593ec02..63de3ec 100644 ---- a/cppconn/datatype.h -+++ b/cppconn/datatype.h -@@ -59,8 +59,7 @@ public: - GEOMETRY, - ENUM, - SET, -- SQLNULL, -- JSON -+ SQLNULL - }; - }; - -diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp -index 572beda..6f4cbca 100644 ---- a/driver/mysql_ps_resultset.cpp -+++ b/driver/mysql_ps_resultset.cpp -@@ -446,7 +446,6 @@ MySQL_Prepared_ResultSet::getDouble(const uint32_t columnIndex) const - case sql::DataType::LONGVARBINARY: - case sql::DataType::SET: - case sql::DataType::ENUM: -- case sql::DataType::JSON: - { - CPP_INFO("It's a string"); - long double ret = sql::mysql::util::strtold(getString(columnIndex).c_str(), NULL); -@@ -615,7 +614,6 @@ MySQL_Prepared_ResultSet::getInt64_intern(const uint32_t columnIndex, bool /* cu - case sql::DataType::LONGVARBINARY: - case sql::DataType::SET: - case sql::DataType::ENUM: -- case sql::DataType::JSON: - CPP_INFO("It's a string"); - return strtoll(getString(columnIndex).c_str(), NULL, 10); - case sql::DataType::BIT: -@@ -763,7 +761,6 @@ MySQL_Prepared_ResultSet::getUInt64_intern(const uint32_t columnIndex, bool /* c - case sql::DataType::LONGVARBINARY: - case sql::DataType::SET: - case sql::DataType::ENUM: -- case sql::DataType::JSON: - CPP_INFO("It's a string"); - return strtoull(getString(columnIndex).c_str(), NULL, 10); - case sql::DataType::BIT: -@@ -1038,7 +1035,6 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const - case sql::DataType::LONGVARBINARY: - case sql::DataType::SET: - case sql::DataType::ENUM: -- case sql::DataType::JSON: - CPP_INFO("It's a string"); - return sql::SQLString(static_cast<char *>(result_bind->rbind[columnIndex - 1].buffer), *result_bind->rbind[columnIndex - 1].length); - default: -diff --git a/driver/mysql_resultbind.cpp b/driver/mysql_resultbind.cpp -index 003b44b..e597ac6 100644 ---- a/driver/mysql_resultbind.cpp -+++ b/driver/mysql_resultbind.cpp -@@ -86,7 +86,6 @@ static struct st_buffer_size_type - case MYSQL_TYPE_BLOB: - case MYSQL_TYPE_STRING: - case MYSQL_TYPE_VAR_STRING: -- case MYSQL_TYPE_JSON: - return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type); - - case MYSQL_TYPE_DECIMAL: -diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp -index e4aaa6c..81af5c4 100644 ---- a/driver/mysql_util.cpp -+++ b/driver/mysql_util.cpp -@@ -431,8 +431,6 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field) - return sql::DataType::SET; - case MYSQL_TYPE_GEOMETRY: - return sql::DataType::GEOMETRY; -- case MYSQL_TYPE_JSON: -- return sql::DataType::JSON; - default: - return sql::DataType::UNKNOWN; - } -@@ -498,8 +496,6 @@ mysql_string_type_to_datatype(const sql::SQLString & name) - return sql::DataType::SET; - } else if (!name.compare("geometry")) { - return sql::DataType::GEOMETRY; -- } else if (!name.compare("json")) { -- return sql::DataType::JSON; - } else { - return sql::DataType::UNKNOWN; - } -@@ -645,8 +641,6 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my - return "SET"; - case MYSQL_TYPE_GEOMETRY: - return "GEOMETRY"; -- case MYSQL_TYPE_JSON: -- return "JSON"; - default: - return "UNKNOWN"; - } diff --git a/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild b/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild index 91386c7b08..0ae1d8a350 100644 --- a/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild +++ b/libraries/mysql-connector-c++/mysql-connector-c++.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mysql-connector-c++ -# Copyright 2013-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2013-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mysql-connector-c++ -VERSION=${VERSION:-1.1.7} +VERSION=${VERSION:-1.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +71,6 @@ find -L . \ # Compatibility patch for MariaDB patch -p1 < $CWD/mariadb_api.patch -patch -p1 < $CWD/mysql-connector-c++-no-JSON.patch mkdir -p build cd build cmake \ diff --git a/libraries/mysql-connector-c++/mysql-connector-c++.info b/libraries/mysql-connector-c++/mysql-connector-c++.info index 92cc1969be..9f8b3dbe55 100644 --- a/libraries/mysql-connector-c++/mysql-connector-c++.info +++ b/libraries/mysql-connector-c++/mysql-connector-c++.info @@ -1,8 +1,8 @@ PRGNAM="mysql-connector-c++" -VERSION="1.1.7" +VERSION="1.1.8" HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" -DOWNLOAD="https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.7.tar.gz" -MD5SUM="4b0425811bca23c0323b97e787b7709e" +DOWNLOAD="https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.8.tar.gz" +MD5SUM="db3fa9c199ad159519074c89f1c0243c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |