Fix Makefile for MariaDB Connector C 3.0.2

pull/1409/head
René Cannaò 8 years ago committed by Nikolaos Vyzas
parent 8d5824c37a
commit 45af204ca6

4
deps/Makefile vendored

@ -68,7 +68,7 @@ jemalloc/jemalloc/lib/libjemalloc.a:
jemalloc: jemalloc/jemalloc/lib/libjemalloc.a
mariadb-client-library/mariadb_client/include/my_config.h:
mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
cd mariadb-client-library && rm -rf mariadb-connector-c-3.0.2-src
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.0.2-src.tar.gz
cd mariadb-client-library/mariadb_client && cmake .
@ -86,7 +86,7 @@ mariadb-client-library/mariadb_client/include/my_config.h:
cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE}
# cd mariadb-client-library/mariadb_client/include && make my_config.h
mariadb_client: mariadb-client-library/mariadb_client/include/my_config.h
mariadb_client: mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a
sqlite3/sqlite3/sqlite3.o:

@ -1,3 +1,5 @@
--- /tmp/mariadb_lib.c 2017-12-28 14:21:33.620559119 +0100
+++ libmariadb/mariadb_lib.c 2017-12-28 15:12:33.117032010 +0100
@@ -1494,9 +1494,16 @@
mysql->client_flag= client_flag;
@ -20,7 +22,7 @@
mysql->db, mysql->port, mysql->unix_socket,
mysql->client_flag | CLIENT_REMEMBER_OPTIONS) ||
- mysql_set_character_set(&tmp_mysql, mysql->charset->csname))
+ mysql_set_character_set(&tmp_mysql, mysql->charset->csname, NULL))
+ mysql_set_character_set(&tmp_mysql, mysql->charset->csname, 0))
{
if (ctxt)
my_context_install_suspend_resume_hook(ctxt, NULL, NULL);

Loading…
Cancel
Save