Global cleanup:

  removed global locks
  removed dead code and files
  removed dbug

CMakeLists.txt

@@ -41,6 +41,8 @@ ELSE()
 ENDIF()
 
 OPTION(WITH_UNITTEST "build test suite" ON)
+OPTION(WITH_DYNCOL "Enables support of dynamic coluumns" ON)
+OPTION(WITH_NONBLOCK "Enables support for non blocking operations" ON)
 OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
 ###############
 IF(WITH_SIGNCODE)
@@ -113,12 +115,7 @@ ENDIF()
 
 # If the build type isn't specified, set to Relwithdebinfo as default.
 IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE "Relwithdebinfo")
-ENDIF()
-
-OPTION(WITH_DBUG "enables use of DBUG library" OFF)
-IF(NOT WITH_DBUG)
-  ADD_DEFINITIONS(-DDBUG_OFF=1)
+  SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
 ENDIF()
 
 # various defines for generating include/mysql_version.h
@@ -243,14 +240,10 @@ IF(NOT WIN32)
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/FindIconv.cmake)
 ENDIF()
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/mysql_version.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/include/mysql_version.h)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/include/my_config.h)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/mysql_version.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql_version.h)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/ma_config.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/include/ma_config.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/mariadb_version.h.in
+               ${CMAKE_CURRENT_SOURCE_DIR}/include/mariadb_version.h)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
 
@@ -294,8 +287,6 @@ IF(NOT WIN32)
   ADD_SUBDIRECTORY(mariadb_config)
 ENDIF()
 
-ADD_SUBDIRECTORY(client)
-
 IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
   IF(WITH_UNITTEST STREQUAL "ON")
     ADD_SUBDIRECTORY(unittest/mytap)

client/ma_plugin_info.c

@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <my_dir.h>
-#include <m_string.h>
+#include <ma_string.h>
 
 #define CLIENT_PLUGIN_INFO_VERSION "1.0.0"
 

cmake/export.cmake

@@ -0,0 +1,16 @@
+MACRO(CREATE_EXPORT_FILE targetname directory symbols)
+  SET(EXPORT_FILE "${directory}/${targetname}.def")
+  IF(WIN32)
+    SET(EXPORT_CONTENT "EXPORTS\n")
+    FOREACH(exp_symbol ${symbols})
+      SET(EXPORT_CONTENT ${EXPORT_CONTENT} "${exp_symbol}\n")
+    ENDFOREACH()
+  ELSE()
+    SET(EXPORT_CONTENT "{\nglobal:\n")
+    FOREACH(exp_symbol ${symbols})
+      SET(EXPORT_CONTENT "${EXPORT_CONTENT} ${exp_symbol}\\;\n")
+    ENDFOREACH()
+    SET(EXPORT_CONTENT "${EXPORT_CONTENT}local:\n *\\;\n}\\;")
+  ENDIF()
+  FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
+ENDMACRO()

cmake/plugins.cmake

@@ -90,7 +90,7 @@ ENDIF()
 # since some files contain multiple plugins, remove duplicates from source files 
 LIST(REMOVE_DUPLICATES LIBMARIADB_SOURCES)
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libmariadb/client_plugin.c.in
-  ${CMAKE_BINARY_DIR}/libmariadb/client_plugin.c)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libmariadb/ma_client_plugin.c.in
+  ${CMAKE_BINARY_DIR}/libmariadb/ma_client_plugin.c)
 
 MARK_AS_ADVANCED(LIBMARIADB_SOURCES)

include/CMakeLists.txt

@@ -2,8 +2,9 @@ SET(MARIADB_CLIENT_INCLUDES
                             ${CMAKE_SOURCE_DIR}/include/mysql_com.h
                             ${CMAKE_SOURCE_DIR}/include/mysql.h
                             ${CMAKE_SOURCE_DIR}/include/my_stmt.h
-                            ${CMAKE_SOURCE_DIR}/include/mysql_version.h
+                            ${CMAKE_SOURCE_DIR}/include/mariadb_version.h
                             ${CMAKE_SOURCE_DIR}/include/my_list.h
+                            ${CMAKE_SOURCE_DIR}/include/mariadb_dyncol.h
                             ${CMAKE_SOURCE_DIR}/include/mariadb_ctype.h)
 SET(MARIADB_ADDITIONAL_INCLUDES
                             PARENT_SCOPE)