r22819 - gnucash/branches/2.4/src/backend/dbi - [r22818][Bug #661832]MySQL database error after wireless reconnect

[John Ralls]

Author: jralls
Date: 2013-03-01 19:25:28 -0500 (Fri, 01 Mar 2013)
New Revision: 22819
Trac: http://svn.gnucash.org/trac/changeset/22819

Modified:
   gnucash/branches/2.4/src/backend/dbi/gnc-backend-dbi.c
Log:
[r22818][Bug #661832]MySQL database error after wireless reconnect

After suggestion by Wang Xiaozhe <chaoslawful at gmail.com>

Modified: gnucash/branches/2.4/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/branches/2.4/src/backend/dbi/gnc-backend-dbi.c	2013-03-02 00:21:30 UTC (rev 22818)
+++ gnucash/branches/2.4/src/backend/dbi/gnc-backend-dbi.c	2013-03-02 00:25:28 UTC (rev 22819)
@@ -531,6 +531,14 @@
         return FALSE;
     }
 
+    result = dbi_conn_set_option( conn, "encoding", "UTF-8" );
+    if ( result < 0 )
+    {
+        PERR( "Error setting 'encoding' option\n" );
+        qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
+        return FALSE;
+    }
+
     return TRUE;
 }
 
@@ -925,15 +933,6 @@
     {
         dbi_result dresult;
 
-        /* Set connection char set to utf8 */
-        dresult = dbi_conn_queryf( be->conn, "SET NAMES 'utf8'" );
-        if ( dresult == NULL )
-        {
-            PERR( "Unable to set connection char set" );
-            qof_backend_set_error( qbe, ERR_BACKEND_SERVER_ERR );
-            goto exit;
-        }
-
         if ( be->sql_be.conn != NULL )
         {
             gnc_sql_connection_dispose( be->sql_be.conn );