diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-16 14:47:46 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-16 14:48:07 +0200 |
commit | dec8372a0b3e7cff5081aa32e3ead407d16e1836 (patch) | |
tree | 76fee044801b8698096b738dff7a0dbb0fef3d88 /dev-db/myodbc/files | |
parent | sci-libs/ignition-math: Drop 3.2.0 (diff) | |
download | gentoo-dec8372a0b3e7cff5081aa32e3ead407d16e1836.tar.gz gentoo-dec8372a0b3e7cff5081aa32e3ead407d16e1836.tar.bz2 gentoo-dec8372a0b3e7cff5081aa32e3ead407d16e1836.zip |
dev-db/myodbc: Drop slot 5.2
Acked-by: Brian Evans <grknight@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'dev-db/myodbc/files')
-rw-r--r-- | dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch | 79 | ||||
-rw-r--r-- | dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 | ||||
-rw-r--r-- | dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch | 40 |
3 files changed, 0 insertions, 137 deletions
diff --git a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch deleted file mode 100644 index 6cfe7cd274b3..000000000000 --- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c ---- a/driver/catalog_no_i_s.c 2014-06-18 18:50:16.000000000 -0400 -+++ b/driver/catalog_no_i_s.c 2014-08-20 14:08:33.997339096 -0400 -@@ -1093,7 +1093,11 @@ - unsigned long *lengths; - SQLRETURN rc= SQL_SUCCESS; - -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0)); -+#else - my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0); -+#endif - - /* Get the list of tables that match szCatalog and szTable */ - pthread_mutex_lock(&stmt->dbc->lock); -diff -aurN a/driver/desc.c b/driver/desc.c ---- a/driver/desc.c 2014-06-18 18:50:16.000000000 -0400 -+++ b/driver/desc.c 2014-08-20 14:07:37.409169269 -0400 -@@ -63,8 +63,12 @@ - but in desc_get_rec we manually get a pointer to it. This avoids - having to call set_dynamic after modifying the DESCREC. - */ -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0))) -+#else - if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) -+#endif - { - x_free((char *)desc); - return NULL; - } -@@ -995,9 +1003,15 @@ - - /* copy the records */ - delete_dynamic(&dest->records); -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ if (my_init_dynamic_array(&dest->records, sizeof(DESCREC), -+ src->records.max_element, -+ src->records.alloc_increment, MYF(0))) -+#else - if (my_init_dynamic_array(&dest->records, sizeof(DESCREC), - src->records.max_element, - src->records.alloc_increment)) -+#endif - { - return set_desc_error(dest, "HY001", - "Memory allocation error", -diff -aurN a/driver/handle.c b/driver/handle.c ---- a/driver/handle.c 2014-06-18 18:50:16.000000000 -0400 -+++ b/driver/handle.c 2014-08-20 14:05:00.364248403 -0400 -@@ -403,7 +403,11 @@ - } - } - -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0)); -+#else - my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10); -+#endif - memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) * - (*param_bind)->max_element); - -diff -aurN a/driver/parse.c b/driver/parse.c ---- a/driver/parse.c 2014-06-18 18:50:16.000000000 -0400 -+++ b/driver/parse.c 2014-08-20 14:03:54.336383876 -0400 -@@ -129,8 +129,13 @@ - - /* TODO: Store offsets rather than ptrs. In this case we will be fine - if work with copy of the originally parsed string */ -+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001 -+ my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0)); -+ my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0)); -+#else - my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10); - my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10); -+#endif - } - - return pq; diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch b/dev-db/myodbc/files/5.2.7-my_malloc.patch deleted file mode 100644 index bc6c65ef3011..000000000000 --- a/dev-db/myodbc/files/5.2.7-my_malloc.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c ---- a/util/odbcinstw.c 2014-04-23 21:54:40.000000000 +0200 -+++ b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200 -@@ -68,13 +68,7 @@ - - if (lpszRetBuffer && cbRetBuffer) - { -- ret= malloc(cbRetBuffer + 1); -- /* -- We cannot rely on getting correct results from the next call of -- SQLGetPrivateProfileString. So, taking precautions against unititialized -- values in the allocated buffer. -- */ -- memset(ret, 0, cbRetBuffer + 1); -+ ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL)); - } - else - ret= NULL; diff --git a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch deleted file mode 100644 index 2bdb4a581c89..000000000000 --- a/dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake ---- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 -+++ b/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400 -@@ -105,16 +105,16 @@ - # Finally remove the dot - STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") - -- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ IF(MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" - OUTPUT_VARIABLE _mysql_config_output - ) - SET(MYSQL_CXX_LINKAGE 1) -- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ELSE (MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" - OUTPUT_VARIABLE _mysql_config_output - ) -- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ENDIF(MYSQL_CXX_LINKAGE) - - # Remove the stl4port dependency - STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") -diff -aurN mysql-connector-odbc-5.2.7-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.7-src/CMakeLists.txt ---- a/CMakeLists.txt 2014-08-27 13:51:27.050553560 -0400 -+++ b/CMakeLists.txt 2014-08-27 13:55:41.702359680 -0400 -@@ -256,10 +256,9 @@ - SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") - SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") - --SET(LIB_SUBDIR "lib") --IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") -- SET(LIB_SUBDIR "lib64") --ENDIF() -+IF(NOT LIB_SUBDIR) -+ MESSAGE(ERROR "LIB_SUBDIR is not set") -+ENDIF(NOT LIB_SUBDIR) - MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") - - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) |