From 3ea76613e359e8ff76ecaa5e68cb3d9d42d54989 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 30 Nov 2012 13:47:24 +0100 Subject: [PATCH] Fix for mariadb_config: lib output was not correct cleanup fixed ps_test (warning_count differs on MariaDB servers) --- CMakeLists.txt | 6 +++--- {libmysql => libmariadb}/CMakeLists.txt | 14 +++++++------- {libmysql => libmariadb}/acinclude.m4 | 0 {libmysql => libmariadb}/array.c | 0 {libmysql => libmariadb}/bchange.c | 0 {libmysql => libmariadb}/bmove.c | 0 {libmysql => libmariadb}/bmove_upp.c | 0 {libmysql => libmariadb}/charset.c | 0 {libmysql => libmariadb}/client_plugin.c | 0 {libmysql => libmariadb}/dbug.c | 0 {libmysql => libmariadb}/default.c | 0 {libmysql => libmariadb}/errmsg.c | 0 {libmysql => libmariadb}/errors.c | 0 {libmysql => libmariadb}/get_password.c | 0 {libmysql => libmariadb}/getopt.c | 0 {libmysql => libmariadb}/getopt1.c | 0 {libmysql => libmariadb}/int2str.c | 0 {libmysql => libmariadb}/is_prefix.c | 0 libmysql/libmysql.c => libmariadb/libmariadb.c | 0 .../libmariadb_exports.def | 0 {libmysql => libmariadb}/list.c | 0 {libmysql => libmariadb}/llstr.c | 0 {libmysql => libmariadb}/longlong2str.c | 0 {libmysql => libmariadb}/mf_dirname.c | 0 {libmysql => libmariadb}/mf_fn_ext.c | 0 {libmysql => libmariadb}/mf_format.c | 0 {libmysql => libmariadb}/mf_loadpath.c | 0 {libmysql => libmariadb}/mf_pack.c | 0 {libmysql => libmariadb}/mf_path.c | 0 {libmysql => libmariadb}/mf_tempfile.c | 0 {libmysql => libmariadb}/mf_unixpath.c | 0 {libmysql => libmariadb}/mf_wcomp.c | 0 {libmysql => libmariadb}/mulalloc.c | 0 {libmysql => libmariadb}/my_alloc.c | 0 {libmysql => libmariadb}/my_auth.c | 0 {libmysql => libmariadb}/my_charset.c | 0 {libmysql => libmariadb}/my_compress.c | 0 {libmysql => libmariadb}/my_create.c | 0 {libmysql => libmariadb}/my_delete.c | 0 {libmysql => libmariadb}/my_div.c | 0 {libmysql => libmariadb}/my_error.c | 0 {libmysql => libmariadb}/my_fopen.c | 0 {libmysql => libmariadb}/my_fstream.c | 0 {libmysql => libmariadb}/my_gethostbyname.c | 0 {libmysql => libmariadb}/my_getwd.c | 0 {libmysql => libmariadb}/my_init.c | 0 {libmysql => libmariadb}/my_lib.c | 0 {libmysql => libmariadb}/my_loaddata.c | 0 {libmysql => libmariadb}/my_malloc.c | 0 {libmysql => libmariadb}/my_messnc.c | 0 {libmysql => libmariadb}/my_net.c | 0 {libmysql => libmariadb}/my_once.c | 0 {libmysql => libmariadb}/my_open.c | 0 {libmysql => libmariadb}/my_port.c | 0 {libmysql => libmariadb}/my_pthread.c | 0 {libmysql => libmariadb}/my_read.c | 0 {libmysql => libmariadb}/my_realloc.c | 0 {libmysql => libmariadb}/my_secure.c | 0 {libmysql => libmariadb}/my_seek.c | 0 {libmysql => libmariadb}/my_static.c | 0 {libmysql => libmariadb}/my_static.h | 0 {libmysql => libmariadb}/my_stmt.c | 0 {libmysql => libmariadb}/my_stmt_codec.c | 1 - {libmysql => libmariadb}/my_symlink.c | 0 {libmysql => libmariadb}/my_thr_init.c | 0 {libmysql => libmariadb}/my_vsnprintf.c | 0 {libmysql => libmariadb}/my_write.c | 0 {libmysql => libmariadb}/mysql_io.c | 0 {libmysql => libmariadb}/mysys_priv.h | 0 {libmysql => libmariadb}/net.c | 0 {libmysql => libmariadb}/password.c | 0 {libmysql => libmariadb}/safemalloc.c | 0 {libmysql => libmariadb}/sha1.c | 0 {libmysql => libmariadb}/str2int.c | 0 {libmysql => libmariadb}/strcend.c | 0 {libmysql => libmariadb}/strcont.c | 0 {libmysql => libmariadb}/strend.c | 0 {libmysql => libmariadb}/strfill.c | 0 {libmysql => libmariadb}/string.c | 0 {libmysql => libmariadb}/strinstr.c | 0 {libmysql => libmariadb}/strmake.c | 0 {libmysql => libmariadb}/strmov.c | 0 {libmysql => libmariadb}/strnlen.c | 0 {libmysql => libmariadb}/strnmov.c | 0 {libmysql => libmariadb}/strto.c | 0 {libmysql => libmariadb}/strtoll.c | 0 {libmysql => libmariadb}/strtoull.c | 0 {libmysql => libmariadb}/strxmov.c | 0 {libmysql => libmariadb}/strxnmov.c | 0 {libmysql => libmariadb}/thr_mutex.c | 0 {libmysql => libmariadb}/typelib.c | 0 {libmysql => libmariadb}/version_script.txt | 0 {libmysql => libmariadb}/violite.c | 0 {mysql_config => mariadb_config}/CMakeLists.txt | 10 +++++----- .../mariadb_config.c.in | 0 unittest/libmariadb/ps.c | 11 +++++++---- 96 files changed, 22 insertions(+), 20 deletions(-) rename {libmysql => libmariadb}/CMakeLists.txt (91%) rename {libmysql => libmariadb}/acinclude.m4 (100%) rename {libmysql => libmariadb}/array.c (100%) rename {libmysql => libmariadb}/bchange.c (100%) rename {libmysql => libmariadb}/bmove.c (100%) rename {libmysql => libmariadb}/bmove_upp.c (100%) rename {libmysql => libmariadb}/charset.c (100%) rename {libmysql => libmariadb}/client_plugin.c (100%) rename {libmysql => libmariadb}/dbug.c (100%) rename {libmysql => libmariadb}/default.c (100%) rename {libmysql => libmariadb}/errmsg.c (100%) rename {libmysql => libmariadb}/errors.c (100%) rename {libmysql => libmariadb}/get_password.c (100%) rename {libmysql => libmariadb}/getopt.c (100%) rename {libmysql => libmariadb}/getopt1.c (100%) rename {libmysql => libmariadb}/int2str.c (100%) rename {libmysql => libmariadb}/is_prefix.c (100%) rename libmysql/libmysql.c => libmariadb/libmariadb.c (100%) rename libmysql/libmysql_exports.def => libmariadb/libmariadb_exports.def (100%) rename {libmysql => libmariadb}/list.c (100%) rename {libmysql => libmariadb}/llstr.c (100%) rename {libmysql => libmariadb}/longlong2str.c (100%) rename {libmysql => libmariadb}/mf_dirname.c (100%) rename {libmysql => libmariadb}/mf_fn_ext.c (100%) rename {libmysql => libmariadb}/mf_format.c (100%) rename {libmysql => libmariadb}/mf_loadpath.c (100%) rename {libmysql => libmariadb}/mf_pack.c (100%) rename {libmysql => libmariadb}/mf_path.c (100%) rename {libmysql => libmariadb}/mf_tempfile.c (100%) rename {libmysql => libmariadb}/mf_unixpath.c (100%) rename {libmysql => libmariadb}/mf_wcomp.c (100%) rename {libmysql => libmariadb}/mulalloc.c (100%) rename {libmysql => libmariadb}/my_alloc.c (100%) rename {libmysql => libmariadb}/my_auth.c (100%) rename {libmysql => libmariadb}/my_charset.c (100%) rename {libmysql => libmariadb}/my_compress.c (100%) rename {libmysql => libmariadb}/my_create.c (100%) rename {libmysql => libmariadb}/my_delete.c (100%) rename {libmysql => libmariadb}/my_div.c (100%) rename {libmysql => libmariadb}/my_error.c (100%) rename {libmysql => libmariadb}/my_fopen.c (100%) rename {libmysql => libmariadb}/my_fstream.c (100%) rename {libmysql => libmariadb}/my_gethostbyname.c (100%) rename {libmysql => libmariadb}/my_getwd.c (100%) rename {libmysql => libmariadb}/my_init.c (100%) rename {libmysql => libmariadb}/my_lib.c (100%) rename {libmysql => libmariadb}/my_loaddata.c (100%) rename {libmysql => libmariadb}/my_malloc.c (100%) rename {libmysql => libmariadb}/my_messnc.c (100%) rename {libmysql => libmariadb}/my_net.c (100%) rename {libmysql => libmariadb}/my_once.c (100%) rename {libmysql => libmariadb}/my_open.c (100%) rename {libmysql => libmariadb}/my_port.c (100%) rename {libmysql => libmariadb}/my_pthread.c (100%) rename {libmysql => libmariadb}/my_read.c (100%) rename {libmysql => libmariadb}/my_realloc.c (100%) rename {libmysql => libmariadb}/my_secure.c (100%) rename {libmysql => libmariadb}/my_seek.c (100%) rename {libmysql => libmariadb}/my_static.c (100%) rename {libmysql => libmariadb}/my_static.h (100%) rename {libmysql => libmariadb}/my_stmt.c (100%) rename {libmysql => libmariadb}/my_stmt_codec.c (99%) rename {libmysql => libmariadb}/my_symlink.c (100%) rename {libmysql => libmariadb}/my_thr_init.c (100%) rename {libmysql => libmariadb}/my_vsnprintf.c (100%) rename {libmysql => libmariadb}/my_write.c (100%) rename {libmysql => libmariadb}/mysql_io.c (100%) rename {libmysql => libmariadb}/mysys_priv.h (100%) rename {libmysql => libmariadb}/net.c (100%) rename {libmysql => libmariadb}/password.c (100%) rename {libmysql => libmariadb}/safemalloc.c (100%) rename {libmysql => libmariadb}/sha1.c (100%) rename {libmysql => libmariadb}/str2int.c (100%) rename {libmysql => libmariadb}/strcend.c (100%) rename {libmysql => libmariadb}/strcont.c (100%) rename {libmysql => libmariadb}/strend.c (100%) rename {libmysql => libmariadb}/strfill.c (100%) rename {libmysql => libmariadb}/string.c (100%) rename {libmysql => libmariadb}/strinstr.c (100%) rename {libmysql => libmariadb}/strmake.c (100%) rename {libmysql => libmariadb}/strmov.c (100%) rename {libmysql => libmariadb}/strnlen.c (100%) rename {libmysql => libmariadb}/strnmov.c (100%) rename {libmysql => libmariadb}/strto.c (100%) rename {libmysql => libmariadb}/strtoll.c (100%) rename {libmysql => libmariadb}/strtoull.c (100%) rename {libmysql => libmariadb}/strxmov.c (100%) rename {libmysql => libmariadb}/strxnmov.c (100%) rename {libmysql => libmariadb}/thr_mutex.c (100%) rename {libmysql => libmariadb}/typelib.c (100%) rename {libmysql => libmariadb}/version_script.txt (100%) rename {libmysql => libmariadb}/violite.c (100%) rename {mysql_config => mariadb_config}/CMakeLists.txt (69%) rename mysql_config/mysql_config.c.in => mariadb_config/mariadb_config.c.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f827644..bb603974 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/libmysql/CMakeLists.txt b/libmariadb/CMakeLists.txt similarity index 91% rename from libmysql/CMakeLists.txt rename to libmariadb/CMakeLists.txt index 268f218c..0f00e065 100644 --- a/libmysql/CMakeLists.txt +++ b/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) diff --git a/libmysql/acinclude.m4 b/libmariadb/acinclude.m4 similarity index 100% rename from libmysql/acinclude.m4 rename to libmariadb/acinclude.m4 diff --git a/libmysql/array.c b/libmariadb/array.c similarity index 100% rename from libmysql/array.c rename to libmariadb/array.c diff --git a/libmysql/bchange.c b/libmariadb/bchange.c similarity index 100% rename from libmysql/bchange.c rename to libmariadb/bchange.c diff --git a/libmysql/bmove.c b/libmariadb/bmove.c similarity index 100% rename from libmysql/bmove.c rename to libmariadb/bmove.c diff --git a/libmysql/bmove_upp.c b/libmariadb/bmove_upp.c similarity index 100% rename from libmysql/bmove_upp.c rename to libmariadb/bmove_upp.c diff --git a/libmysql/charset.c b/libmariadb/charset.c similarity index 100% rename from libmysql/charset.c rename to libmariadb/charset.c diff --git a/libmysql/client_plugin.c b/libmariadb/client_plugin.c similarity index 100% rename from libmysql/client_plugin.c rename to libmariadb/client_plugin.c diff --git a/libmysql/dbug.c b/libmariadb/dbug.c similarity index 100% rename from libmysql/dbug.c rename to libmariadb/dbug.c diff --git a/libmysql/default.c b/libmariadb/default.c similarity index 100% rename from libmysql/default.c rename to libmariadb/default.c diff --git a/libmysql/errmsg.c b/libmariadb/errmsg.c similarity index 100% rename from libmysql/errmsg.c rename to libmariadb/errmsg.c diff --git a/libmysql/errors.c b/libmariadb/errors.c similarity index 100% rename from libmysql/errors.c rename to libmariadb/errors.c diff --git a/libmysql/get_password.c b/libmariadb/get_password.c similarity index 100% rename from libmysql/get_password.c rename to libmariadb/get_password.c diff --git a/libmysql/getopt.c b/libmariadb/getopt.c similarity index 100% rename from libmysql/getopt.c rename to libmariadb/getopt.c diff --git a/libmysql/getopt1.c b/libmariadb/getopt1.c similarity index 100% rename from libmysql/getopt1.c rename to libmariadb/getopt1.c diff --git a/libmysql/int2str.c b/libmariadb/int2str.c similarity index 100% rename from libmysql/int2str.c rename to libmariadb/int2str.c diff --git a/libmysql/is_prefix.c b/libmariadb/is_prefix.c similarity index 100% rename from libmysql/is_prefix.c rename to libmariadb/is_prefix.c diff --git a/libmysql/libmysql.c b/libmariadb/libmariadb.c similarity index 100% rename from libmysql/libmysql.c rename to libmariadb/libmariadb.c diff --git a/libmysql/libmysql_exports.def b/libmariadb/libmariadb_exports.def similarity index 100% rename from libmysql/libmysql_exports.def rename to libmariadb/libmariadb_exports.def diff --git a/libmysql/list.c b/libmariadb/list.c similarity index 100% rename from libmysql/list.c rename to libmariadb/list.c diff --git a/libmysql/llstr.c b/libmariadb/llstr.c similarity index 100% rename from libmysql/llstr.c rename to libmariadb/llstr.c diff --git a/libmysql/longlong2str.c b/libmariadb/longlong2str.c similarity index 100% rename from libmysql/longlong2str.c rename to libmariadb/longlong2str.c diff --git a/libmysql/mf_dirname.c b/libmariadb/mf_dirname.c similarity index 100% rename from libmysql/mf_dirname.c rename to libmariadb/mf_dirname.c diff --git a/libmysql/mf_fn_ext.c b/libmariadb/mf_fn_ext.c similarity index 100% rename from libmysql/mf_fn_ext.c rename to libmariadb/mf_fn_ext.c diff --git a/libmysql/mf_format.c b/libmariadb/mf_format.c similarity index 100% rename from libmysql/mf_format.c rename to libmariadb/mf_format.c diff --git a/libmysql/mf_loadpath.c b/libmariadb/mf_loadpath.c similarity index 100% rename from libmysql/mf_loadpath.c rename to libmariadb/mf_loadpath.c diff --git a/libmysql/mf_pack.c b/libmariadb/mf_pack.c similarity index 100% rename from libmysql/mf_pack.c rename to libmariadb/mf_pack.c diff --git a/libmysql/mf_path.c b/libmariadb/mf_path.c similarity index 100% rename from libmysql/mf_path.c rename to libmariadb/mf_path.c diff --git a/libmysql/mf_tempfile.c b/libmariadb/mf_tempfile.c similarity index 100% rename from libmysql/mf_tempfile.c rename to libmariadb/mf_tempfile.c diff --git a/libmysql/mf_unixpath.c b/libmariadb/mf_unixpath.c similarity index 100% rename from libmysql/mf_unixpath.c rename to libmariadb/mf_unixpath.c diff --git a/libmysql/mf_wcomp.c b/libmariadb/mf_wcomp.c similarity index 100% rename from libmysql/mf_wcomp.c rename to libmariadb/mf_wcomp.c diff --git a/libmysql/mulalloc.c b/libmariadb/mulalloc.c similarity index 100% rename from libmysql/mulalloc.c rename to libmariadb/mulalloc.c diff --git a/libmysql/my_alloc.c b/libmariadb/my_alloc.c similarity index 100% rename from libmysql/my_alloc.c rename to libmariadb/my_alloc.c diff --git a/libmysql/my_auth.c b/libmariadb/my_auth.c similarity index 100% rename from libmysql/my_auth.c rename to libmariadb/my_auth.c diff --git a/libmysql/my_charset.c b/libmariadb/my_charset.c similarity index 100% rename from libmysql/my_charset.c rename to libmariadb/my_charset.c diff --git a/libmysql/my_compress.c b/libmariadb/my_compress.c similarity index 100% rename from libmysql/my_compress.c rename to libmariadb/my_compress.c diff --git a/libmysql/my_create.c b/libmariadb/my_create.c similarity index 100% rename from libmysql/my_create.c rename to libmariadb/my_create.c diff --git a/libmysql/my_delete.c b/libmariadb/my_delete.c similarity index 100% rename from libmysql/my_delete.c rename to libmariadb/my_delete.c diff --git a/libmysql/my_div.c b/libmariadb/my_div.c similarity index 100% rename from libmysql/my_div.c rename to libmariadb/my_div.c diff --git a/libmysql/my_error.c b/libmariadb/my_error.c similarity index 100% rename from libmysql/my_error.c rename to libmariadb/my_error.c diff --git a/libmysql/my_fopen.c b/libmariadb/my_fopen.c similarity index 100% rename from libmysql/my_fopen.c rename to libmariadb/my_fopen.c diff --git a/libmysql/my_fstream.c b/libmariadb/my_fstream.c similarity index 100% rename from libmysql/my_fstream.c rename to libmariadb/my_fstream.c diff --git a/libmysql/my_gethostbyname.c b/libmariadb/my_gethostbyname.c similarity index 100% rename from libmysql/my_gethostbyname.c rename to libmariadb/my_gethostbyname.c diff --git a/libmysql/my_getwd.c b/libmariadb/my_getwd.c similarity index 100% rename from libmysql/my_getwd.c rename to libmariadb/my_getwd.c diff --git a/libmysql/my_init.c b/libmariadb/my_init.c similarity index 100% rename from libmysql/my_init.c rename to libmariadb/my_init.c diff --git a/libmysql/my_lib.c b/libmariadb/my_lib.c similarity index 100% rename from libmysql/my_lib.c rename to libmariadb/my_lib.c diff --git a/libmysql/my_loaddata.c b/libmariadb/my_loaddata.c similarity index 100% rename from libmysql/my_loaddata.c rename to libmariadb/my_loaddata.c diff --git a/libmysql/my_malloc.c b/libmariadb/my_malloc.c similarity index 100% rename from libmysql/my_malloc.c rename to libmariadb/my_malloc.c diff --git a/libmysql/my_messnc.c b/libmariadb/my_messnc.c similarity index 100% rename from libmysql/my_messnc.c rename to libmariadb/my_messnc.c diff --git a/libmysql/my_net.c b/libmariadb/my_net.c similarity index 100% rename from libmysql/my_net.c rename to libmariadb/my_net.c diff --git a/libmysql/my_once.c b/libmariadb/my_once.c similarity index 100% rename from libmysql/my_once.c rename to libmariadb/my_once.c diff --git a/libmysql/my_open.c b/libmariadb/my_open.c similarity index 100% rename from libmysql/my_open.c rename to libmariadb/my_open.c diff --git a/libmysql/my_port.c b/libmariadb/my_port.c similarity index 100% rename from libmysql/my_port.c rename to libmariadb/my_port.c diff --git a/libmysql/my_pthread.c b/libmariadb/my_pthread.c similarity index 100% rename from libmysql/my_pthread.c rename to libmariadb/my_pthread.c diff --git a/libmysql/my_read.c b/libmariadb/my_read.c similarity index 100% rename from libmysql/my_read.c rename to libmariadb/my_read.c diff --git a/libmysql/my_realloc.c b/libmariadb/my_realloc.c similarity index 100% rename from libmysql/my_realloc.c rename to libmariadb/my_realloc.c diff --git a/libmysql/my_secure.c b/libmariadb/my_secure.c similarity index 100% rename from libmysql/my_secure.c rename to libmariadb/my_secure.c diff --git a/libmysql/my_seek.c b/libmariadb/my_seek.c similarity index 100% rename from libmysql/my_seek.c rename to libmariadb/my_seek.c diff --git a/libmysql/my_static.c b/libmariadb/my_static.c similarity index 100% rename from libmysql/my_static.c rename to libmariadb/my_static.c diff --git a/libmysql/my_static.h b/libmariadb/my_static.h similarity index 100% rename from libmysql/my_static.h rename to libmariadb/my_static.h diff --git a/libmysql/my_stmt.c b/libmariadb/my_stmt.c similarity index 100% rename from libmysql/my_stmt.c rename to libmariadb/my_stmt.c diff --git a/libmysql/my_stmt_codec.c b/libmariadb/my_stmt_codec.c similarity index 99% rename from libmysql/my_stmt_codec.c rename to libmariadb/my_stmt_codec.c index ff8badb0..e4a08e77 100644 --- a/libmysql/my_stmt_codec.c +++ b/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); diff --git a/libmysql/my_symlink.c b/libmariadb/my_symlink.c similarity index 100% rename from libmysql/my_symlink.c rename to libmariadb/my_symlink.c diff --git a/libmysql/my_thr_init.c b/libmariadb/my_thr_init.c similarity index 100% rename from libmysql/my_thr_init.c rename to libmariadb/my_thr_init.c diff --git a/libmysql/my_vsnprintf.c b/libmariadb/my_vsnprintf.c similarity index 100% rename from libmysql/my_vsnprintf.c rename to libmariadb/my_vsnprintf.c diff --git a/libmysql/my_write.c b/libmariadb/my_write.c similarity index 100% rename from libmysql/my_write.c rename to libmariadb/my_write.c diff --git a/libmysql/mysql_io.c b/libmariadb/mysql_io.c similarity index 100% rename from libmysql/mysql_io.c rename to libmariadb/mysql_io.c diff --git a/libmysql/mysys_priv.h b/libmariadb/mysys_priv.h similarity index 100% rename from libmysql/mysys_priv.h rename to libmariadb/mysys_priv.h diff --git a/libmysql/net.c b/libmariadb/net.c similarity index 100% rename from libmysql/net.c rename to libmariadb/net.c diff --git a/libmysql/password.c b/libmariadb/password.c similarity index 100% rename from libmysql/password.c rename to libmariadb/password.c diff --git a/libmysql/safemalloc.c b/libmariadb/safemalloc.c similarity index 100% rename from libmysql/safemalloc.c rename to libmariadb/safemalloc.c diff --git a/libmysql/sha1.c b/libmariadb/sha1.c similarity index 100% rename from libmysql/sha1.c rename to libmariadb/sha1.c diff --git a/libmysql/str2int.c b/libmariadb/str2int.c similarity index 100% rename from libmysql/str2int.c rename to libmariadb/str2int.c diff --git a/libmysql/strcend.c b/libmariadb/strcend.c similarity index 100% rename from libmysql/strcend.c rename to libmariadb/strcend.c diff --git a/libmysql/strcont.c b/libmariadb/strcont.c similarity index 100% rename from libmysql/strcont.c rename to libmariadb/strcont.c diff --git a/libmysql/strend.c b/libmariadb/strend.c similarity index 100% rename from libmysql/strend.c rename to libmariadb/strend.c diff --git a/libmysql/strfill.c b/libmariadb/strfill.c similarity index 100% rename from libmysql/strfill.c rename to libmariadb/strfill.c diff --git a/libmysql/string.c b/libmariadb/string.c similarity index 100% rename from libmysql/string.c rename to libmariadb/string.c diff --git a/libmysql/strinstr.c b/libmariadb/strinstr.c similarity index 100% rename from libmysql/strinstr.c rename to libmariadb/strinstr.c diff --git a/libmysql/strmake.c b/libmariadb/strmake.c similarity index 100% rename from libmysql/strmake.c rename to libmariadb/strmake.c diff --git a/libmysql/strmov.c b/libmariadb/strmov.c similarity index 100% rename from libmysql/strmov.c rename to libmariadb/strmov.c diff --git a/libmysql/strnlen.c b/libmariadb/strnlen.c similarity index 100% rename from libmysql/strnlen.c rename to libmariadb/strnlen.c diff --git a/libmysql/strnmov.c b/libmariadb/strnmov.c similarity index 100% rename from libmysql/strnmov.c rename to libmariadb/strnmov.c diff --git a/libmysql/strto.c b/libmariadb/strto.c similarity index 100% rename from libmysql/strto.c rename to libmariadb/strto.c diff --git a/libmysql/strtoll.c b/libmariadb/strtoll.c similarity index 100% rename from libmysql/strtoll.c rename to libmariadb/strtoll.c diff --git a/libmysql/strtoull.c b/libmariadb/strtoull.c similarity index 100% rename from libmysql/strtoull.c rename to libmariadb/strtoull.c diff --git a/libmysql/strxmov.c b/libmariadb/strxmov.c similarity index 100% rename from libmysql/strxmov.c rename to libmariadb/strxmov.c diff --git a/libmysql/strxnmov.c b/libmariadb/strxnmov.c similarity index 100% rename from libmysql/strxnmov.c rename to libmariadb/strxnmov.c diff --git a/libmysql/thr_mutex.c b/libmariadb/thr_mutex.c similarity index 100% rename from libmysql/thr_mutex.c rename to libmariadb/thr_mutex.c diff --git a/libmysql/typelib.c b/libmariadb/typelib.c similarity index 100% rename from libmysql/typelib.c rename to libmariadb/typelib.c diff --git a/libmysql/version_script.txt b/libmariadb/version_script.txt similarity index 100% rename from libmysql/version_script.txt rename to libmariadb/version_script.txt diff --git a/libmysql/violite.c b/libmariadb/violite.c similarity index 100% rename from libmysql/violite.c rename to libmariadb/violite.c diff --git a/mysql_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt similarity index 69% rename from mysql_config/CMakeLists.txt rename to mariadb_config/CMakeLists.txt index 2a53649c..b7955959 100644 --- a/mysql_config/CMakeLists.txt +++ b/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}) - STRING(REGEX MATCH "^-.*$" out "${dep}") +FOREACH (dep ${libmariadb_LIB_DEPENDS}) + 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 - ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c @ONLY) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in + ${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 diff --git a/mysql_config/mysql_config.c.in b/mariadb_config/mariadb_config.c.in similarity index 100% rename from mysql_config/mysql_config.c.in rename to mariadb_config/mariadb_config.c.in diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c index 38096aad..0cee6ac4 100644 --- a/unittest/libmariadb/ps.c +++ b/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;