Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Mon, 28 Jul 2014 22:54:43
Message-Id: 1406587924.316964138f9cdba7450affbead89fa91b4587302.grknight.pub@gentoo
1 commit: 316964138f9cdba7450affbead89fa91b4587302
2 Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
3 AuthorDate: Mon Jul 28 22:52:04 2014 +0000
4 Commit: Brian Evans <grknight <AT> tuffmail <DOT> com>
5 CommitDate: Mon Jul 28 22:52:04 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=31696413
7
8 Fix runtime symbols of myodbc
9
10 ---
11 00000_index.txt | 14 +++++++++++++-
12 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch | 15 +++++++++++++++
13 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch | 12 ++++++++++++
14 3 files changed, 40 insertions(+), 1 deletion(-)
15
16 diff --git a/00000_index.txt b/00000_index.txt
17 index 48b6ab1..4f167a1 100644
18 --- a/00000_index.txt
19 +++ b/00000_index.txt
20 @@ -1661,12 +1661,24 @@
21 @@ Backport tzinfo symlink fix from MariaDB bug 491176
22
23 @patch 20009_all_mariadb_myodbc_symbol_fix.patch
24 -@ver 5.05.37.00 to 10.99.99.99
25 +@ver 5.05.37.00 to 5.05.37.99
26 @pn mariadb
27 @pn mariadb-galera
28 @@ Export missing symbol my_charset_latin1
29 @@ MariaDB bug MDEV-6131
30
31 +@patch 20009_all_mysql_myodbc_symbol_fix-5.5.38.patch
32 +@ver 5.05.38.00 to 5.07.99.99
33 +@pn mysql
34 +@pn percona-server
35 +@@ Export missing symbols
36 +
37 +@patch 20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
38 +@ver 5.05.38.00 to 10.99.99.99
39 +@pn mariadb
40 +@pn mariadb-galera
41 +@@ Export missing symbols at runtime
42 +
43 @patch 20010_all_mysql51-bison3.patch
44 @ver 5.01.73.00 to 5.01.99.99
45 @pn mysql
46
47 diff --git a/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
48 new file mode 100644
49 index 0000000..d43e234
50 --- /dev/null
51 +++ b/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
52 @@ -0,0 +1,15 @@
53 +diff -aurwN mysql.orig/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt
54 +--- mysql.orig/libmysql/CMakeLists.txt 2014-07-27 22:21:41.711342411 -0400
55 ++++ mysql/libmysql/CMakeLists.txt 2014-07-27 22:26:15.558596434 -0400
56 +@@ -325,6 +325,11 @@
57 + strmake
58 + strmake_root
59 + strxmov
60 ++ my_thread_end_wait_time
61 ++ insert_dynamic
62 ++ delete_dynamic_element
63 ++ my_qsort
64 ++ allocate_dynamic
65 +
66 + # pam_mysql.so
67 + make_scrambled_password
68
69 diff --git a/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch
70 new file mode 100644
71 index 0000000..80b24ef
72 --- /dev/null
73 +++ b/20009_all_mysql_myodbc_symbol_fix-5.5.38.patch
74 @@ -0,0 +1,12 @@
75 +diff -auwrN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
76 +--- a/libmysql/CMakeLists.txt 2014-07-27 22:03:27.806254846 -0400
77 ++++ b/libmysql/CMakeLists.txt 2014-07-27 22:05:08.400521754 -0400
78 +@@ -131,6 +131,8 @@
79 + mysql_set_character_set
80 + mysql_get_character_set_info
81 + mysql_stmt_next_result
82 ++dynstr_append_os_quoted
83 ++strfill
84 +
85 + CACHE INTERNAL "Functions exported by client API"
86 +