[Libreoffice-commits] core.git: connectivity/source include/sal

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 30 20:33:49 UTC 2018


 connectivity/source/drivers/mysqlc/mysqlc_general.cxx           |    2 +-
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |    2 +-
 include/sal/log-areas.dox                                       |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e2ecce7e01038baac502f4b69c7ad47e82cd1ab4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 30 14:33:28 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Aug 30 22:33:23 2018 +0200

    Combine mysqlc and connectivity.mysqlc log areas
    
    Change-Id: I2d13401dc21548018235bab715d54eb3ae81b51b
    Reviewed-on: https://gerrit.libreoffice.org/59807
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 126c9940a895..c1caf782016d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -83,7 +83,7 @@ void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize)
             *mem = nullptr;
             break;
         default:
-            SAL_WARN("mysqlc", "unknown enum_field_type");
+            SAL_WARN("connectivity.mysqlc", "unknown enum_field_type");
     }
 }
 
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index e188793d7e50..97c1da289d02 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -125,7 +125,7 @@ void SAL_CALL OPreparedStatement::close()
 
     if (mysql_stmt_close(m_pStmt))
     {
-        SAL_WARN("mysqlc", "failed to close mysql prepared statement");
+        SAL_WARN("connectivity.mysqlc", "failed to close mysql prepared statement");
     }
     m_pStmt = nullptr; // it's deallocated already
     clearWarnings();
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d92db0ae571e..d718f649be70 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -606,7 +606,6 @@ certain functionality.
 @li @c lingucomponent
 @li @c linguistic
 @li @c lwp - lotuswordpro
- at li @c mysqlc
 @li @c opencl
 @li @c opencl.device
 @li @c opencl.file


More information about the Libreoffice-commits mailing list