[glom/mysql: 10/21] MySQL: Use the new PROTOCOL connection parameter with libgda.

[Murray Cumming <murrayc src gnome org>]

commit cab07f3fe9349e6fae0459e94f7a67443a5a2e75
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 3 23:52:55 2013 +0100

    MySQL: Use the new PROTOCOL connection parameter with libgda.
    
            * glom/libglom/connectionpool_backends/mysql.cc: attempt_connect():
    	We must specify the TCP protocol when using MySQL on a non-standard
    	port. See libgda bug #691069

 ChangeLog                                     |    8 ++++++++
 configure.ac                                  |    2 +-
 glom/libglom/connectionpool_backends/mysql.cc |    3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b9c22a8..7b2a3c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2013-01-03  Murray Cumming  <murrayc murrayc com>
 
+        MySQL: Use the new PROTOCOL connection parameter with libgda.
+
+        * glom/libglom/connectionpool_backends/mysql.cc: attempt_connect():
+	We must specify the TCP protocol when using MySQL on a non-standard 
+	port. See libgda bug #691069
+
+2013-01-03  Murray Cumming  <murrayc murrayc com>
+
         Privs::get_default_developer_user_name(): Take hosting_mode parameters.
 
         * glom/libglom/privs.[h|cc]:
diff --git a/configure.ac b/configure.ac
index 38e19f1..7c6e5d0 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 18ad52b..a21ce50 100644
--- a/glom/libglom/connectionpool_backends/mysql.cc
+++ b/glom/libglom/connectionpool_backends/mysql.cc
@@ -85,7 +85,8 @@ Glib::RefPtr<Gnome::Gda::Connection> MySQL::attempt_connect(const Glib::ustring&
   const Glib::ustring default_database = "INFORMATION_SCHEMA";
   //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);
+   + ";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
   const Glib::ustring cnc_string = cnc_string_main +";DB_NAME=" + DbUtils::gda_cnc_string_encode(database);
 
   Glib::RefPtr<Gnome::Gda::Connection> connection;