summaryrefslogtreecommitdiff
path: root/dev-db/myodbc
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/myodbc')
-rw-r--r--dev-db/myodbc/Manifest3
-rw-r--r--dev-db/myodbc/files/5.3-cxxlinkage.patch43
-rw-r--r--dev-db/myodbc/files/5.3-mariadb-buffer_length.patch93
-rw-r--r--dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch96
4 files changed, 0 insertions, 235 deletions
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 4c9f6d086cc7..c638da55a58f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,9 +2,6 @@ AUX 5.2.7-mariadb-dynamic-array.patch 3053 BLAKE2B 1c72b7318dcfd035655285c433a88
AUX 5.2.7-my_malloc.patch 594 BLAKE2B c9d9aad2e9b9e3e2b30ff41e6ec68343557123517b808df6888d91f48e68cbb1de852f31b057dffea40264a717077e4bbce6f78438535eb11cb660986f469892 SHA512 bcd26b2f8de21404c741fec51bb7e7bec32a5d3fbc90471c157ee275dc6136a44a6ef4d2ad8dd170e2852679d3fcb0cc74cf4acca0570702206b4cded1cb1fa5
AUX 5.2.7-r1-cxxlinkage.patch 1707 BLAKE2B aaf7ef0f319f2e00034307f51406c82580f5d257b61d722d7d610e731b9c549ff54b88279689c226df72837c5af35911ee1f4dd756b989f4018a78d3e3d5e940 SHA512 3d0f1839e1b200d7746d2c7161ee2a85813bf40517a70777d361e482efd6d6b0be88415d339d6dccc49de865a0d714fbbce2b74abb1bbc12c4f4681a5bd5abf8
AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
-AUX 5.3-cxxlinkage.patch 1687 BLAKE2B 6ed84c304bf4fd22cf894e6eaf98202056d78f32b5ef55ac83b19b2dbb2a6b3441adc1faae4eb01d5eae49d01585b08fa231f7f7b9d56530b49ee342e28b7928 SHA512 404242e009e3c22000d599be20856e7610f845abc086519082d9b45ad3a904cfcc569cdcab5eade904a8b27b59af954df0cba870520792290187259a9b0012bc
-AUX 5.3-mariadb-buffer_length.patch 3242 BLAKE2B 56931a6f9ce1a03b207a7b0fe282f392fc97e9a501666a209ad06391d3ff318b5516e397edf90f8a648eec07967cbd7dbce1fff19f33036448b442568e00d256 SHA512 b267c76da77594715edff83aa223d0e45f7b369a142707f91f44a7c862fdf319d6ffd8726927fd7f44b32a779a0fc96b87e04f882d6cf99f7df0385eaa8021c2
-AUX 5.3-mariadb-dynamic-array.patch 3654 BLAKE2B 699cac32b39ea1a6761aa5045c16be413fd499f11f5a1046a92f80c8c5ebffabccbdba174ef90c88ac7d2e6932ab5fc527b8d2a0914a147110f3bacf44fe1e7e SHA512 8599fb01062db680dbfd0f054eab0f91b5ca8f1799fd602ff4634241936ab4d8f5e26e6149f6d92e97241c953369259a142b1ab02e9b8bbe6fb16cd44d78ffff
AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch
deleted file mode 100644
index 319262c81ca3..000000000000
--- a/dev-db/myodbc/files/5.3-cxxlinkage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
---- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500
-+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500
-@@ -747,7 +747,7 @@
- endif()
-
- if(NOT MYSQL_CXXFLAGS)
-- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
-+ if(MYSQL_CXX_LINKAGE)
- _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
- set(MYSQL_CXX_LINKAGE 1)
- else()
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500
-+++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500
-@@ -242,10 +242,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}")
-
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
---- a/cmake/FindMySQL.cmake 2017-02-17 14:44:29.532733308 -0500
-+++ b/cmake/FindMySQL.cmake 2017-02-17 14:48:56.756740330 -0500
-@@ -270,8 +270,8 @@
- set(_static_lib_ext ".lib") # Careful, can be import library for DLL
- elseif(MYSQLCLIENT_NO_THREADS)
- # In 5.1 and below there is a single threaded library
-- set(_dynamic_libs "mysqlclient")
-- set(_static_libs "libmysqlclient.a")
-+ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}")
-+ set(_static_libs "lib${MYSQLCLIENT_LIB_NAME}.a")
- set(_static_lib_ext ".a")
- else()
- # We try the multithreaded "libmysqlclient_r" first and if not
diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
deleted file mode 100644
index 1be9cc466b65..000000000000
--- a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -aurN a/driver/connect.c b/driver/connect.c
---- a/driver/connect.c 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/connect.c 2017-02-17 16:14:48.116640371 -0500
-@@ -510,11 +510,11 @@
- }
- }
-
--#if MYSQL_VERSION_ID >= 50709
-- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length);
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
-+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value);
- #else
- // for older versions just use net_buffer_length() macro
-- dbc->net_buffer_length = net_buffer_length;
-+ dbc->net_buffer_length_value = net_buffer_length;
- #endif
- return rc;
-
-diff -aurN a/driver/cursor.c b/driver/cursor.c
---- a/driver/cursor.c 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/cursor.c 2017-02-17 16:13:19.163299885 -0500
-@@ -1485,7 +1485,7 @@
- We have a limited capacity to shove data across the wire, but
- we handle this by sending in multiple calls to exec_stmt_query()
- */
-- if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length)
-+ if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value)
- {
- break_insert= TRUE;
- break;
-diff -aurN a/driver/driver.h b/driver/driver.h
---- a/driver/driver.h 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/driver.h 2017-02-17 16:10:57.072950723 -0500
-@@ -378,7 +378,7 @@
- int txn_isolation;
- uint port;
- uint cursor_count;
-- ulong net_buffer_length;
-+ ulong net_buffer_length_value;
- uint commit_flag;
- #ifdef THREAD
- myodbc_mutex_t lock;
-diff -aurN a/driver/info.c b/driver/info.c
---- a/driver/info.c 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/info.c 2017-02-17 16:12:54.315763441 -0500
-@@ -587,7 +587,7 @@
- MYINFO_SET_USHORT(0);
-
- case SQL_MAX_STATEMENT_LEN:
-- MYINFO_SET_ULONG(dbc->net_buffer_length);
-+ MYINFO_SET_ULONG(dbc->net_buffer_length_value);
-
- case SQL_MAX_TABLE_NAME_LEN:
- MYINFO_SET_USHORT(NAME_LEN);
-diff -aurN a/driver/connect.c b/driver/connect.c
---- a/driver/connect.c 2017-02-17 16:16:14.609026769 -0500
-+++ b/driver/connect.c 2017-02-17 16:34:29.637592664 -0500
-@@ -179,7 +179,7 @@
- /* Set other connection options */
-
- if (ds->allow_big_results || ds->safe)
--#if MYSQL_VERSION_ID >= 50709
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
- mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
- #else
- /* max_allowed_packet is a magical mysql macro. */
-@@ -252,7 +252,7 @@
- ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
- }
-
--#if MYSQL_VERSION_ID >= 50710
-+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
- {
- char tls_options[128] = { 0 };
- if (!ds->no_tls_1)
-@@ -323,7 +323,7 @@
- #endif
-
- mysql->options.use_ssl = !ds->disable_ssl_default;
--#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
- {
- if (ds->ssl_enforce)
- {
-@@ -332,7 +332,7 @@
- }
- #endif
-
--#if MYSQL_VERSION_ID >= 50711
-+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
- if (ds->sslmode)
- {
- unsigned int mode = 0;
diff --git a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
deleted file mode 100644
index 96720618a586..000000000000
--- a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
+++ /dev/null
@@ -1,96 +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 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/catalog_no_i_s.c 2017-02-17 14:07:03.979683613 -0500
-@@ -1093,7 +1093,11 @@
- unsigned long *lengths;
- SQLRETURN rc= SQL_SUCCESS;
-
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+ myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
-+#else
- myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
-
- /* Get the list of tables that match szCatalog and szTable */
- myodbc_mutex_lock(&stmt->dbc->lock);
-diff -aurN a/driver/desc.c b/driver/desc.c
---- a/driver/desc.c 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/desc.c 2017-02-17 14:09:30.139954232 -0500
-@@ -63,13 +63,21 @@
- 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 (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
- if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
-+#endif
- {
- x_free((char *)desc);
- return NULL;
- }
-
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+ if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
- if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
-+#endif
- {
- delete_dynamic(&desc->records);
- x_free((char *)desc);
-@@ -997,7 +1005,11 @@
- delete_dynamic(&dest->records);
- if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC),
- src->records.max_element,
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+ src->records.alloc_increment, MYF(0)))
-+#else
- 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 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/handle.c 2017-02-17 14:10:32.078797593 -0500
-@@ -409,7 +409,11 @@
- }
- }
-
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+ myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
-+#else
- myodbc_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 2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/parse.c 2017-02-17 14:12:00.638143846 -0500
-@@ -139,8 +139,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
-+ myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0));
-+ myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
-+#else
- myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10);
- myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
-+#endif
- }
-
- return pq;
-diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h
---- a/MYODBC_MYSQL.h 2016-11-29 07:40:13.000000000 -0500
-+++ b/MYODBC_MYSQL.h 2017-02-17 15:04:47.153994839 -0500
-@@ -44,7 +44,7 @@
- #endif
-
- #ifdef THREAD
--#if MYSQL_VERSION_ID < 50703
-+#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION)
- #include <my_pthread.h>
- #define myodbc_mutex_t pthread_mutex_t
- #define myodbc_key_t pthread_key_t
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 15:20:07 +0000