Fix for mariadb_config: lib output was not correct

cleanup
fixed ps_test (warning_count differs on MariaDB servers)

CMakeLists.txt

@@ -1,7 +1,7 @@
 # CMakeLists.txt
 
 
-# This is the libmysql-lgpl project.
+# This is the LGPL libmariadb project.
 PROJECT(mariadb-client C)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 1)
@@ -95,10 +95,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h.in
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
 
-ADD_SUBDIRECTORY(libmysql)
+ADD_SUBDIRECTORY(libmariadb)
 ADD_SUBDIRECTORY(examples)
 IF(NOT WIN32)
-  ADD_SUBDIRECTORY(mysql_config)
+  ADD_SUBDIRECTORY(mariadb_config)
 ENDIF()
 
 IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)

libmariadb/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${ZLIB_INC}
-                    ${CMAKE_SOURCE_DIR}/libmysql)
+                    ${CMAKE_SOURCE_DIR}/libmariadb)
 					
 IF(OPENSSL_FOUND)
  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
@@ -11,7 +11,7 @@ ADD_DEFINITIONS(-D ENABLED_LOCAL_INFILE)
 ADD_DEFINITIONS(-D HAVE_COMPRESS)
 ADD_DEFINITIONS(-D THREAD)
 
-SET(LIBMYSQL_SOURCES 
+SET(LIBMARIADB_SOURCES 
 array.c 
 bchange.c 
 bmove.c 
@@ -30,7 +30,7 @@ getopt.c
 get_password.c
 int2str.c
 is_prefix.c
-libmysql.c
+libmariadb.c
 list.c
 llstr.c
 longlong2str.c 
@@ -95,7 +95,7 @@ my_stmt_codec.c
 client_plugin.c
 my_auth.c
 my_secure.c
-libmysql_exports.def
+libmariadb_exports.def
 )
 
 
@@ -122,18 +122,18 @@ ELSE()
     ../zlib/uncompr.c
     ../zlib/zutil.c
   )
-  SET(LIBMYSQL_SOURCES ${LIBMYSQL_SOURCES} ${ZLIB_SOURCES})
+SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${ZLIB_SOURCES})
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib)
 ENDIF()
 
 
-ADD_LIBRARY(mariadbclient STATIC ${LIBMYSQL_SOURCES})
+ADD_LIBRARY(mariadbclient STATIC ${LIBMARIADB_SOURCES})
 TARGET_LINK_LIBRARIES(mariadbclient ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 IF(OPENSSL_FOUND)
   TARGET_LINK_LIBRARIES(mariadbclient ${OPENSSL_LIBRARIES})
 ENDIF()
 
-ADD_LIBRARY(libmariadb SHARED ${LIBMYSQL_SOURCES})
+ADD_LIBRARY(libmariadb SHARED ${LIBMARIADB_SOURCES})
 TARGET_LINK_LIBRARIES(libmariadb ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 
 IF(OPENSSL_FOUND)

libmariadb/my_stmt_codec.c

@@ -571,7 +571,6 @@ static void convert_from_float(MYSQL_BIND *r_param, const MYSQL_FIELD *field, do
 
      length= MIN(MAX_DOUBLE_STRING_REP_LENGTH - 1, r_param->buffer_length);
 
-     /* TODO: move this to a header shared between client and server. */
      if (field->decimals >= NOT_FIXED_DEC)
      {
        sprintf(buff, "%-*.*g", (int) length-1, DBL_DIG, val);

mariadb_config/CMakeLists.txt

@@ -2,8 +2,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 # Figure out additional libraries for use with 
 
-FOREACH (dep ${libmysql_LIB_DEPENDS})
+FOREACH (dep ${libmariadb_LIB_DEPENDS})
-  STRING(REGEX MATCH "^-.*$" out "${dep}")
+  STRING(REGEX MATCH "^-l.*$" out "${dep}")
   IF(out)
     SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${dep}")
   ENDIF(out)
@@ -21,10 +21,10 @@ IF(UNIX)
   ENDIF(MATH_LIBRARY)
 ENDIF(UNIX)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.c.in
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
-               ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c @ONLY)
+               ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
 
-ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c)
+ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
 TARGET_LINK_LIBRARIES(mariadb_config mariadbclient)
 
 # Installation

unittest/libmariadb/ps.c

@@ -2463,14 +2463,17 @@ static int test_pure_coverage(MYSQL *mysql)
   check_stmt_rc(rc, stmt);
   my_bind[0].buffer_type= MYSQL_TYPE_GEOMETRY;
   rc= mysql_stmt_bind_result(stmt, my_bind);
-  FAIL_IF(!rc, "Error expected");
 
+  /* Since libmariadb supports geometry types in prepared statements
+     we have to skip the following check
+  FAIL_IF(!rc, "Error expected");
   rc= mysql_stmt_store_result(stmt);
   FAIL_UNLESS(rc, "");
 
   rc= mysql_stmt_store_result(stmt);
-  FAIL_UNLESS(rc, ""); /* Old error must be reset first */
+  FAIL_UNLESS(rc, ""); 
 
+  */
   mysql_stmt_close(stmt);
 
   mysql_query(mysql, "DROP TABLE test_pure");
@@ -3042,7 +3045,7 @@ static int test_datetime_ranges(MYSQL *mysql)
   rc= mysql_stmt_execute(stmt);
   check_stmt_rc(rc, stmt);
 
-  FAIL_IF(mysql_warning_count(mysql) != 12, "warning count != 12");
+  FAIL_IF(mysql_warning_count(mysql) != 6, "warning count != 6");
 
   if (verify_col_data(mysql, "t1", "year", "0000-00-00 00:00:00"))
     goto error;
@@ -3080,7 +3083,7 @@ static int test_datetime_ranges(MYSQL *mysql)
 
   rc= mysql_stmt_execute(stmt);
   check_stmt_rc(rc, stmt);
-  FAIL_IF(mysql_warning_count(mysql) != 6, "warning count != 6");
+  FAIL_IF(mysql_warning_count(mysql) != 3, "warning count != 3");
 
   if (verify_col_data(mysql, "t1", "year", "0000-00-00 00:00:00"))
     goto error;