summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@tuffmail.com>2014-04-18 11:28:00 -0400
committerBrian Evans <grknight@tuffmail.com>2014-04-18 11:28:00 -0400
commit6f0435c30079826df1d7fcbf3e6419ef2a3043b9 (patch)
treea1a87c003b749a223846a1d63c2498a13ed5575e
parentRenable mysql_config patch for testing (diff)
downloadmysql-extras-6f0435c30079826df1d7fcbf3e6419ef2a3043b9.tar.gz
mysql-extras-6f0435c30079826df1d7fcbf3e6419ef2a3043b9.tar.bz2
mysql-extras-6f0435c30079826df1d7fcbf3e6419ef2a3043b9.zip
Fix myodbc compilation due to missing symbol
Signed-off-by: Brian Evans <grknight@tuffmail.com>
-rw-r--r--00000_index.txt7
-rw-r--r--20009_all_mariadb_myodbc_symbol_fix.patch10
2 files changed, 17 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt
index dc34ce8..883b33d 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -1641,3 +1641,10 @@
@pn mysql
@pn percona-server
@@ 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
+@pn mariadb
+@pn mariadb-galera
+@@ Export missing symbol my_charset_latin1
+@@ MariaDB bug MDEV-6131
diff --git a/20009_all_mariadb_myodbc_symbol_fix.patch b/20009_all_mariadb_myodbc_symbol_fix.patch
new file mode 100644
index 0000000..1ae1c8e
--- /dev/null
+++ b/20009_all_mariadb_myodbc_symbol_fix.patch
@@ -0,0 +1,10 @@
+--- a/libmysql/CMakeLists.txt 2014-04-18 11:23:20.792196748 -0400
++++ b/libmysql/CMakeLists.txt 2014-04-18 11:01:32.743379333 -0400
+@@ -261,6 +261,7 @@
+ mysql_get_charset
+ mysql_get_charset_by_csname
+ mysql_net_realloc
++ my_charset_latin1
+
+ # PHP's mysqli.so requires this (via the ER() macro)
+ mysql_client_errors