db/driver: fix MySQL driver compilation warnings (#3344)

configure: improve MySQL detection, print version
OSGeo · Feb 15, 2024 · f4334e4 · f4334e4
1 parent bc850a0
commit f4334e4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/configure b/configure
@@ -12133,6 +12133,9 @@ fi
   fi
 
   if test "$MYSQLD_CONFIG" != "" ; then
+    mysql_version=`"$MYSQLD_CONFIG" --version`
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using MySQL/MariaDB version \"$mysql_version\"" >&5
+printf "%s\n" "using MySQL/MariaDB version \"$mysql_version\"" >&6; }
     ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12146,10 +12149,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     ac_fn_cxx_check_func "$LINENO" "mysql_server_init" "ac_cv_func_mysql_server_init"
 if test "x$ac_cv_func_mysql_server_init" = xyes
 then :
-
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libmysqld found" >&5
+printf "%s\n" "libmysqld found" >&6; }
 else $as_nop
-  MYSQLDLIB="";
-                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libmysqld not found" >&5
+  MYSQLDLIB=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libmysqld not found" >&5
 printf "%s\n" "$as_me: WARNING: libmysqld not found" >&2;}
 fi
 

diff --git a/configure.ac b/configure.ac
@@ -1287,13 +1287,16 @@ if test -n "$USE_MYSQL"; then
   fi
 
   if test "$MYSQLD_CONFIG" != "" ; then
+    mysql_version=`"$MYSQLD_CONFIG" --version`
+    AC_MSG_RESULT([using MySQL/MariaDB version "$mysql_version"])
     AC_LANG_PUSH([C++])
     ac_save_libs="$LIBS"
     MYSQLDLIB=`"$MYSQLD_CONFIG" --libmysqld-libs`
 
     LIBS="$MYSQLDLIB $LIBS"
-    AC_CHECK_FUNC(mysql_server_init,,[MYSQLDLIB="";
-                  AC_MSG_WARN([libmysqld not found])] )
+    AC_CHECK_FUNC(mysql_server_init,
+                  AC_MSG_RESULT([libmysqld found]),
+                  [MYSQLDLIB=""; AC_MSG_WARN([libmysqld not found])])
     LIBS=$ac_save_libs
     AC_LANG_POP([C++])
   fi

diff --git a/db/drivers/mysql/driver.c b/db/drivers/mysql/driver.c
@@ -16,7 +16,7 @@
 #include "globals.h"
 #include "proto.h"
 
-int db__driver_init(int argc, char *argv[])
+int db__driver_init(int argc UNUSED, char *argv[] UNUSED)
 {
     init_error();
     return DB_OK;

diff --git a/db/drivers/mysql/fetch.c b/db/drivers/mysql/fetch.c
@@ -250,8 +250,7 @@ int db__driver_fetch(dbCursor *cn, int position, int *more)
     return DB_OK;
 }
 
-int db__driver_get_num_rows(cn)
-dbCursor *cn;
+int db__driver_get_num_rows(dbCursor *cn)
 {
     cursor *c;
     dbToken token;

diff --git a/db/drivers/mysql/listtab.c b/db/drivers/mysql/listtab.c
@@ -18,7 +18,7 @@
 #include "globals.h"
 #include "proto.h"
 
-int db__driver_list_tables(dbString **tlist, int *tcount, int system)
+int db__driver_list_tables(dbString **tlist, int *tcount, int system UNUSED)
 {
     int i;
     dbString *list;
@@ -32,7 +32,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system)
     res = mysql_list_tables(connection, NULL);
 
     if (res == NULL) {
-        db_d_append_error("%s\%s", _("Unable get list of tables:"),
+        db_d_append_error("%s\n%s", _("Unable get list of tables:"),
                           mysql_error(connection));
         db_d_report_error();
         return DB_FAILED;