gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/b1915a0b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cdeee960 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9319858b (commit)



commit b1915a0b89396446f0bf2fb6c78bed32eab3ee08
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 10 09:34:06 2018 -0700

    Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open...
    
    MariaDB.
    MariaDB (and probably MySQL) doesn't accept two queries in a single
    command.

diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c
index 5708f78..29bd82d 100644
--- a/src/backend/dbi/gnc-backend-dbi.c
+++ b/src/backend/dbi/gnc-backend-dbi.c
@@ -3326,10 +3326,10 @@ conn_test_dbi_library( dbi_conn conn )
     GncDbiTestResult retval = GNC_DBI_PASS;
     memset( doublestr, 0, sizeof(doublestr));
 
-    result = dbi_conn_query( conn, "DROP TABLE IF EXISTS numtest;"
-                             "CREATE TEMPORARY TABLE numtest "
+    result = dbi_conn_query (conn, "DROP TABLE IF EXISTS numtest;");
+    result = dbi_conn_query (con, "CREATE TEMPORARY TABLE numtest "
                              "( test_int BIGINT, test_unsigned BIGINT,"
-                             " test_double FLOAT8 )" );
+                             " test_double FLOAT8 )");
     if ( result == NULL )
     {
         PWARN("Test_DBI_Library: Create table failed");

commit cdeee96074211ee8a16f2cf666398525def81341
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 10 09:30:58 2018 -0700

    Revert "Bug 795049 - GnuCash 2.6.20-1 (Fedora Linux package) is unable to open..."
    
    This reverts commit aea33ca515aceb4f63a5cbc8165d4ec93f245d0c because
    it doesn't fix the problem, just tests that the problem is only on
    MySQL/MariaDB.

diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c
index 4a55a62..386a2c3 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.c
+++ b/src/backend/dbi/test/test-backend-dbi-basic.c
@@ -666,15 +666,15 @@ test_suite_gnc_backend_dbi (void)
     }
     if (g_list_find_custom (drivers, "sqlite3", (GCompareFunc)g_strcmp0))
         create_dbi_test_suite ("sqlite3", "sqlite3");
+    if (strlen (TEST_MYSQL_URL) > 0 &&
+            g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0))
+        create_dbi_test_suite ("mysql", TEST_MYSQL_URL);
     if (strlen (TEST_PGSQL_URL) > 0 &&
             g_list_find_custom (drivers, "pgsql", (GCompareFunc)g_strcmp0))
     {
         g_setenv ("PGOPTIONS", "-c client_min_messages=WARNING", FALSE);
         create_dbi_test_suite ("postgres", TEST_PGSQL_URL);
     }
-    if (strlen (TEST_MYSQL_URL) > 0 &&
-            g_list_find_custom (drivers, "mysql", (GCompareFunc)g_strcmp0))
-        create_dbi_test_suite ("mysql", TEST_MYSQL_URL);
 
     GNC_TEST_ADD_FUNC( suitename, "adjust sql options string localtime", 
         test_adjust_sql_options_string );



Summary of changes:
 src/backend/dbi/gnc-backend-dbi.c             | 6 +++---
 src/backend/dbi/test/test-backend-dbi-basic.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)