From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DD37913877A for ; Mon, 18 Aug 2014 20:22:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DA77E08E5; Mon, 18 Aug 2014 20:22:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07CDBE08DA for ; Mon, 18 Aug 2014 20:21:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32A4B33FC95 for ; Mon, 18 Aug 2014 20:21:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D36133762 for ; Mon, 18 Aug 2014 20:21:57 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1406587924.316964138f9cdba7450affbead89fa91b4587302.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 316964138f9cdba7450affbead89fa91b4587302 X-VCS-Branch: master Date: Mon, 18 Aug 2014 20:21:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 051e3034-a519-4db3-bf3d-d66b414c30f0 X-Archives-Hash: 6d328ae7d088b735da075edb8eee9b49 commit: 316964138f9cdba7450affbead89fa91b4587302 Author: Brian Evans tuffmail com> AuthorDate: Mon Jul 28 22:52:04 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jul 28 22:52:04 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=31696413 Fix runtime symbols of myodbc --- 00000_index.txt | 14 +++++++++++++- 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch | 15 +++++++++++++++ 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch | 12 ++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/00000_index.txt b/00000_index.txt index 48b6ab1..4f167a1 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1661,12 +1661,24 @@ @@ Backport tzinfo symlink fix from MariaDB bug 491176 @patch 20009_all_mariadb_myodbc_symbol_fix.patch -@ver 5.05.37.00 to 10.99.99.99 +@ver 5.05.37.00 to 5.05.37.99 @pn mariadb @pn mariadb-galera @@ Export missing symbol my_charset_latin1 @@ MariaDB bug MDEV-6131 +@patch 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch +@ver 5.05.38.00 to 5.07.99.99 +@pn mysql +@pn percona-server +@@ Export missing symbols + +@patch 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch +@ver 5.05.38.00 to 10.99.99.99 +@pn mariadb +@pn mariadb-galera +@@ Export missing symbols at runtime + @patch 20010_all_mysql51-bison3.patch @ver 5.01.73.00 to 5.01.99.99 @pn mysql diff --git a/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch new file mode 100644 index 0000000..d43e234 --- /dev/null +++ b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch @@ -0,0 +1,15 @@ +diff -aurwN mysql.orig/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt +--- mysql.orig/libmysql/CMakeLists.txt 2014-07-27 22:21:41.711342411 -0400 ++++ mysql/libmysql/CMakeLists.txt 2014-07-27 22:26:15.558596434 -0400 +@@ -325,6 +325,11 @@ + strmake + strmake_root + strxmov ++ my_thread_end_wait_time ++ insert_dynamic ++ delete_dynamic_element ++ my_qsort ++ allocate_dynamic + + # pam_mysql.so + make_scrambled_password diff --git a/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch new file mode 100644 index 0000000..80b24ef --- /dev/null +++ b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch @@ -0,0 +1,12 @@ +diff -auwrN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2014-07-27 22:03:27.806254846 -0400 ++++ b/libmysql/CMakeLists.txt 2014-07-27 22:05:08.400521754 -0400 +@@ -131,6 +131,8 @@ + mysql_set_character_set + mysql_get_character_set_info + mysql_stmt_next_result ++dynstr_append_os_quoted ++strfill + + CACHE INTERNAL "Functions exported by client API" +