[glom] Require a new-enough libgda.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Require a new-enough libgda.
- Date: Thu, 7 Nov 2013 10:41:09 +0000 (UTC)
commit f3e1db7355165d8b5f99f5105a9e207e62530545
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 7 10:34:44 2013 +0100
Require a new-enough libgda.
This is only really needed for the (not really used) MySQL support,
in MySQL::attempt_connect() which uses PROTOCOL=TCP, but that libgda
version should be widely available by now.
configure.ac | 2 +-
glom/libglom/connectionpool_backends/mysql.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1cb9c71..c9f2772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ AS_IF([test "x$glom_enable_postgresql" = xyes],
# Libraries used by libglom:
-REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0
libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.0.3 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0'
+REQUIRED_LIBGLOM_LIBS='giomm-2.4 >= 2.32.0 libxml++-2.6 >= 2.23.1 libxslt >= 1.1.10 pygobject-3.0 >= 2.29.0
libgdamm-5.0 >= 4.99.6 libgda-5.0 >= 5.1.2 libgda-postgres-5.0 libgda-postgres-5.0 libgda-mysql-5.0'
AS_IF([test "x$glom_host_win32" != xyes],
[REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
diff --git a/glom/libglom/connectionpool_backends/mysql.cc b/glom/libglom/connectionpool_backends/mysql.cc
index 1a20d39..e05d6be 100644
--- a/glom/libglom/connectionpool_backends/mysql.cc
+++ b/glom/libglom/connectionpool_backends/mysql.cc
@@ -86,7 +86,7 @@ Glib::RefPtr<Gnome::Gda::Connection> MySQL::attempt_connect(const Glib::ustring&
//const Glib::ustring& actual_database = (!database.empty()) ? database : default_database;;
const Glib::ustring cnc_string_main = "HOST=" + DbUtils::gda_cnc_string_encode(m_host)
+ ";PORT=" + DbUtils::gda_cnc_string_encode(port)
- + ";PROTOCOL=TCP"; //PROTOCOL is in libgda >= 5.1.2. See
https://bugzilla.gnome.org/show_bug.cgi?id=691069#c2
+ + ";PROTOCOL=TCP"; //PROTOCOL is in libgda >= 5.1.2.
const Glib::ustring cnc_string = cnc_string_main +";DB_NAME=" + DbUtils::gda_cnc_string_encode(database);
Glib::RefPtr<Gnome::Gda::Connection> connection;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]