diff options
| -rw-r--r-- | libmysql/CMakeLists.txt | 427 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 107 | ||||
| -rw-r--r-- | libmysql/libmysql_versions.ld.in | 33 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/client_settings.h (renamed from libmysql/client_settings.h) | 6 | ||||
| -rw-r--r-- | libmysqld/libmysql.c (renamed from libmysql/libmysql.c) | 4 | ||||
| -rw-r--r-- | plugin/auth_dialog/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugin/auth_examples/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | sql-common/conf_to_src.c (renamed from libmysql/conf_to_src.c) | 0 | ||||
| -rw-r--r-- | sql-common/errmsg.c (renamed from libmysql/errmsg.c) | 0 | ||||
| -rw-r--r-- | sql-common/get_password.c (renamed from libmysql/get_password.c) | 0 | ||||
| -rw-r--r-- | sql/CMakeLists.txt | 2 |
13 files changed, 22 insertions, 585 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt deleted file mode 100644 index 41710bf08a7..00000000000 --- a/libmysql/CMakeLists.txt +++ /dev/null @@ -1,427 +0,0 @@ -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. -# Copyright (c) 2009, 2013, SkySQL Ab. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/libmysql - ${PCRE_INCLUDES} - ${CMAKE_SOURCE_DIR}/strings - ${SSL_INCLUDE_DIRS} - ${SSL_INTERNAL_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR}) -ADD_DEFINITIONS(${SSL_DEFINES}) - -SET(CLIENT_API_FUNCTIONS_5_1 -get_tty_password -mysql_thread_end -mysql_thread_init -myodbc_remove_escape -mysql_affected_rows -mysql_autocommit -mysql_stmt_bind_param -mysql_stmt_bind_result -mysql_change_user -mysql_character_set_name -mysql_close -mysql_commit -mysql_data_seek -mysql_debug -mysql_dump_debug_info -mysql_eof -mysql_errno -mysql_error -mysql_escape_string -mysql_hex_string -mysql_stmt_execute -mysql_stmt_fetch -mysql_stmt_fetch_column -mysql_fetch_field -mysql_fetch_field_direct -mysql_fetch_fields -mysql_fetch_lengths -mysql_fetch_row -mysql_field_count -mysql_field_seek -mysql_field_tell -mysql_free_result -mysql_get_parameters -mysql_get_client_info -mysql_get_host_info -mysql_get_proto_info -mysql_get_server_info -mysql_get_client_version -mysql_get_ssl_cipher -mysql_info -mysql_init -mysql_insert_id -mysql_kill -mysql_set_server_option -mysql_list_dbs -mysql_list_fields -mysql_list_processes -mysql_list_tables -mysql_more_results -mysql_next_result -mysql_num_fields -mysql_num_rows -mysql_options -mysql_stmt_param_count -mysql_stmt_param_metadata -mysql_ping -mysql_stmt_result_metadata -mysql_query -mysql_read_query_result -mysql_real_connect -mysql_real_escape_string -mysql_real_query -mysql_refresh -mysql_rollback -mysql_row_seek -mysql_row_tell -mysql_select_db -mysql_stmt_send_long_data -mysql_send_query -mysql_shutdown -mysql_ssl_set -mysql_stat -mysql_stmt_affected_rows -mysql_stmt_close -mysql_stmt_reset -mysql_stmt_data_seek -mysql_stmt_errno -mysql_stmt_error -mysql_stmt_free_result -mysql_stmt_num_rows -mysql_stmt_row_seek -mysql_stmt_row_tell -mysql_stmt_store_result -mysql_store_result -mysql_thread_id -mysql_thread_safe -mysql_use_result -mysql_warning_count -mysql_stmt_sqlstate -mysql_sqlstate -mysql_get_server_version -mysql_stmt_prepare -mysql_stmt_init -mysql_stmt_insert_id -mysql_stmt_attr_get -mysql_stmt_attr_set -mysql_stmt_field_count -mysql_set_local_infile_default -mysql_set_local_infile_handler -mysql_embedded -mysql_server_init -mysql_server_end -mysql_set_character_set -mysql_get_character_set_info -# These are documented in Paul DuBois' MySQL book, -# so we treat them as part of the de-facto API. -handle_options -load_defaults -free_defaults -my_print_help -) - -SET(CLIENT_API_FUNCTIONS_5_5 -my_progname -mysql_stmt_next_result -# Charsets -my_charset_bin -my_charset_latin1 -my_charset_utf8_general_ci -# Client plugins -mysql_client_find_plugin -mysql_client_register_plugin -mysql_load_plugin -mysql_load_plugin_v -mysql_plugin_options -# Async API -mysql_get_timeout_value -mysql_get_timeout_value_ms -mysql_get_socket -mysql_autocommit_cont -mysql_autocommit_start -mysql_change_user_cont -mysql_change_user_start -mysql_close_cont -mysql_close_start -mysql_commit_cont -mysql_commit_start -mysql_dump_debug_info_cont -mysql_dump_debug_info_start -mysql_fetch_row_cont -mysql_fetch_row_start -mysql_free_result_cont -mysql_free_result_start -mysql_kill_cont -mysql_kill_start -mysql_list_dbs_cont -mysql_list_dbs_start -mysql_list_fields_cont -mysql_list_fields_start -mysql_list_processes_cont -mysql_list_processes_start -mysql_list_tables_cont -mysql_list_tables_start -mysql_next_result_cont -mysql_next_result_start -mysql_ping_cont -mysql_ping_start -mysql_query_cont -mysql_query_start -mysql_read_query_result_cont -mysql_read_query_result_start -mysql_real_connect_cont -mysql_real_connect_start -mysql_real_query_cont -mysql_real_query_start -mysql_refresh_cont -mysql_refresh_start -mysql_rollback_cont -mysql_rollback_start -mysql_select_db_cont -mysql_select_db_start -mysql_send_query_cont -mysql_send_query_start -mysql_set_character_set_cont -mysql_set_character_set_start -mysql_set_server_option_cont -mysql_set_server_option_start -mysql_shutdown_cont -mysql_shutdown_start -mysql_stat_cont -mysql_stat_start -mysql_stmt_close_cont -mysql_stmt_close_start -mysql_stmt_execute_cont -mysql_stmt_execute_start -mysql_stmt_fetch_cont -mysql_stmt_fetch_start -mysql_stmt_free_result_cont -mysql_stmt_free_result_start -mysql_stmt_next_result_cont -mysql_stmt_next_result_start -mysql_stmt_prepare_cont -mysql_stmt_prepare_start -mysql_stmt_reset_cont -mysql_stmt_reset_start -mysql_stmt_send_long_data_cont -mysql_stmt_send_long_data_start -mysql_stmt_store_result_cont -mysql_stmt_store_result_start -mysql_store_result_cont -mysql_store_result_start -#dynamic columns api -dynamic_column_create -dynamic_column_create_many -dynamic_column_update -dynamic_column_update_many -dynamic_column_exists -dynamic_column_list -dynamic_column_get -dynamic_column_prepare_decimal -mariadb_dyncol_create_many_num -mariadb_dyncol_create_many_named -mariadb_dyncol_update_many_num -mariadb_dyncol_update_many_named -mariadb_dyncol_exists_num -mariadb_dyncol_exists_named -mariadb_dyncol_free -mariadb_dyncol_list_num -mariadb_dyncol_list_named -mariadb_dyncol_get_num -mariadb_dyncol_get_named -mariadb_dyncol_has_names -mariadb_dyncol_check -mariadb_dyncol_json -mariadb_dyncol_val_str -mariadb_dyncol_val_long -mariadb_dyncol_val_double -mariadb_dyncol_unpack -mariadb_dyncol_unpack_free -mariadb_dyncol_column_cmp_named -mariadb_dyncol_column_count -mariadb_dyncol_prepare_decimal -# -mariadb_deinitialize_ssl -# low-level API to MySQL protocol -mysql_net_read_packet -mysql_net_field_length -# Added in MariaDB-10.0 to stay compatible with MySQL-5.6, yuck! -mysql_options4 -) - -SET(CLIENT_API_FUNCTIONS - ${CLIENT_API_FUNCTIONS_5_1} - ${CLIENT_API_FUNCTIONS_5_5} - CACHE INTERNAL - "Client functions" -) - -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - IF (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING) - - INCLUDE (CheckCSourceCompiles) - FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.ld" - "VERSION {\nlibmysqlclient_18 {\nglobal: *;\n};\n}\n") - SET(CMAKE_REQUIRED_LIBRARIES "-Wl,src.ld") - CHECK_C_SOURCE_COMPILES("int main() { return 0; }" - SUPPORTS_VERSION_IN_LINK_SCRIPT) - SET(CMAKE_REQUIRED_LIBRARIES) - - IF (NOT SUPPORTS_VERSION_IN_LINK_SCRIPT) - # https://sourceware.org/bugzilla/show_bug.cgi?id=16895 - MESSAGE(SEND_ERROR "Your current linker does not support VERSION " - "command in linker scripts like a GNU ld or any compatible linker " - "should. Perhaps you're using gold? Either switch to GNU ld compatible " - "linker or run cmake with -DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=TRUE " - "to be able to complete the build") - ENDIF (NOT SUPPORTS_VERSION_IN_LINK_SCRIPT) - - # When building RPM, or DEB package on Debian, use ELF symbol versioning - # for compatibility with distribution packages, so client shared library can - # painlessly replace the one supplied by the distribution. - - # Also list of exported symbols in distributions may differ from what is - # considered official API. Define CLIENT_API_5_1_EXTRA for the set of - # symbols, that required to be exported on different platforms. - - # Fedora & Co declared following functions as part of API - SET(CLIENT_API_5_1_EXTRA - # why does Fedora export these? - _fini - _init - my_init - - # mysql-connector-odbc requires these - mysql_default_charset_info - mysql_get_charset - mysql_get_charset_by_csname - mysql_net_realloc - - # PHP's mysqli.so requires this (via the ER() macro) - mysql_client_errors - - # Also export the non-renamed variants - # (in case someone wants to rebuild mysqli-php or something similar) - # See MDEV-4127 - default_charset_info - get_charset - get_charset_by_csname - net_realloc - client_errors - - # pure-ftpd requires this - my_make_scrambled_password - - # hydra requires this - scramble - - # ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602 - THR_KEY_mysys - - # DBD::mysql requires this - is_prefix - ) - - - # And even more so on Debian - SET(CLIENT_API_5_5_EXTRA - # libmyodbc. Argh! - alloc_dynamic - alloc_root - delete_dynamic - dynstr_append - dynstr_append_mem - dynstr_append_os_quoted - dynstr_free - dynstr_realloc - free_root - get_dynamic - init_dynamic_array2 - init_dynamic_string - int2str - list_add - list_delete - my_end - my_free - my_malloc - my_memdup - my_realloc - my_strdup - set_dynamic - strdup_root - strend - strfill - strmake - strmake_root - strxmov - - # pam_mysql.so - make_scrambled_password - make_scrambled_password_323 - ) - - # Generate version script. - # Create semicolon separated lists of functions to export from - # Since RPM packages use separate versioning for 5.1 API - # and 5.5 API (libmysqlclient_16 vs libmysqlclient_18), - # we need 2 lists. - SET (VERSION_HEADER -"VERSION { - libmysqlclient_18 { - global:") - SET (VERSION_FOOTER -" local: - *; - }; - - libmysqlclient_16 { - /* empty here. aliases are added above */ - }; -} -") - - SET (CLIENT_API_5_1_LIST) - SET (CLIENT_API_5_1_ALIASES) - FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA}) - SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n") - SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n") - ENDFOREACH() - - SET (CLIENT_API_5_5_LIST) - FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA}) - SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n") - ENDFOREACH() - - ELSE (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING) - SET (CLIENT_API_5_1_ALIASES "/* Versioning disabled per user request. MDEV-5982 */") - ENDIF (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING) - - # Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529 - SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_versions.ld.in) - - CONFIGURE_FILE( - ${VERSION_SCRIPT_TEMPLATE} - ${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld - @ONLY - ) - SET(VERSION_SCRIPT_LINK_FLAGS - "-Wl,${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld") - -ENDIF() diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def deleted file mode 100644 index 5a6bee4919f..00000000000 --- a/libmysql/libmysql.def +++ /dev/null @@ -1,107 +0,0 @@ -LIBRARY LIBMYSQL -VERSION 6.0 -EXPORTS - load_defaults - mysql_thread_end - mysql_thread_init - myodbc_remove_escape - mysql_affected_rows - mysql_autocommit - mysql_stmt_bind_param - mysql_stmt_bind_result - mysql_change_user - mysql_character_set_name - mysql_close - mysql_commit - mysql_data_seek - mysql_debug - mysql_dump_debug_info - mysql_eof - mysql_errno - mysql_error - mysql_escape_string - mysql_hex_string - mysql_stmt_execute - mysql_stmt_fetch - mysql_stmt_fetch_column - mysql_fetch_field - mysql_fetch_field_direct - mysql_fetch_fields - mysql_fetch_lengths - mysql_fetch_row - mysql_field_count - mysql_field_seek - mysql_field_tell - mysql_free_result - mysql_get_client_info - mysql_get_host_info - mysql_get_proto_info - mysql_get_server_info - mysql_get_client_version - mysql_get_ssl_cipher - mysql_info - mysql_init - mysql_insert_id - mysql_kill - mysql_set_server_option - mysql_list_dbs - mysql_list_fields - mysql_list_processes - mysql_list_tables - mysql_more_results - mysql_next_result - mysql_num_fields - mysql_num_rows - mysql_options - mysql_stmt_param_count - mysql_stmt_param_metadata - mysql_ping - mysql_stmt_result_metadata - mysql_query - mysql_read_query_result - mysql_real_connect - mysql_real_escape_string - mysql_real_query - mysql_refresh - mysql_rollback - mysql_row_seek - mysql_row_tell - mysql_select_db - mysql_stmt_send_long_data - mysql_send_query - mysql_shutdown - mysql_ssl_set - mysql_stat - mysql_stmt_affected_rows - mysql_stmt_close - mysql_stmt_reset - mysql_stmt_data_seek - mysql_stmt_errno - mysql_stmt_error - mysql_stmt_free_result - mysql_stmt_num_rows - mysql_stmt_row_seek - mysql_stmt_row_tell - mysql_stmt_store_result - mysql_store_result - mysql_thread_id - mysql_thread_safe - mysql_use_result - mysql_warning_count - mysql_stmt_sqlstate - mysql_sqlstate - mysql_get_server_version - mysql_stmt_prepare - mysql_stmt_init - mysql_stmt_insert_id - mysql_stmt_attr_get - mysql_stmt_attr_set - mysql_stmt_field_count - mysql_set_local_infile_default - mysql_set_local_infile_handler - mysql_embedded - mysql_server_init - mysql_server_end - mysql_set_character_set - mysql_get_character_set_info - mysql_get_server_name diff --git a/libmysql/libmysql_versions.ld.in b/libmysql/libmysql_versions.ld.in deleted file mode 100644 index 0cf5b45cc18..00000000000 --- a/libmysql/libmysql_versions.ld.in +++ /dev/null @@ -1,33 +0,0 @@ -/* - This version script is heavily inspired by Fedora's and Mageia's version - scripts for MySQL client shared library. - But it was modified to support Debian-compatible versioning too. - - In RedHat universe, symbols from old libmysqlclient.so.16 - keep their libmysqlclient_16 version. New symbols added in - libmysqlclient.so.18 get the new libmysqlclient_18 version. - - In Debian all symbols in libmysqlclient.so.18 have libmysqlclient_18 version, - including symbols that existed in libmysqlclient.so.16 - - We solve this by putting all symbols into libmysqlclient_18 version node, - but creating aliases for old symbols in the libmysqlclient_16 version node. -*/ - -@CLIENT_API_5_1_ALIASES@ - -/* - On Fedora the following symbols are exported, but renamed into a mysql_ - namespace. We export them as aliases, but keep original symbols too. See - MDEV-4127. -*/ -mysql_default_charset_info = default_charset_info; -mysql_get_charset = get_charset; -mysql_get_charset_by_csname = get_charset_by_csname; -mysql_net_realloc = net_realloc; -mysql_client_errors = client_errors; - -@VERSION_HEADER@ -@CLIENT_API_5_1_LIST@ -@CLIENT_API_5_5_LIST@ -@VERSION_FOOTER@ diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index e0a0ab6413b..c2a56cd2fd6 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -18,7 +18,6 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include -${CMAKE_SOURCE_DIR}/libmysql ${CMAKE_SOURCE_DIR}/libmysqld ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/sql @@ -37,7 +36,7 @@ ${CMAKE_BINARY_DIR}/sql/lex_hash.h SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED TRUE) SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc - ../libmysql/libmysql.c ../libmysql/errmsg.c + libmysql.c ../sql-common/errmsg.c ../sql-common/client.c ../sql-common/my_user.c ../sql-common/pack.c ../sql-common/client_plugin.c ../sql-common/mysql_async.c diff --git a/libmysql/client_settings.h b/libmysqld/client_settings.h index 2577870bfa3..14be8b61f70 100644 --- a/libmysql/client_settings.h +++ b/libmysqld/client_settings.h @@ -1,14 +1,14 @@ /* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/libmysql/libmysql.c b/libmysqld/libmysql.c index de50acde2f4..379a2d15fa0 100644 --- a/libmysql/libmysql.c +++ b/libmysqld/libmysql.c @@ -122,9 +122,7 @@ typedef struct st_mysql_stmt_extension 1 could not initialize environment (out of memory or thread keys) */ -int STDCALL mysql_server_init(int argc __attribute__((unused)), - char **argv __attribute__((unused)), - char **groups __attribute__((unused))) +int STDCALL mysql_server_init(int argc, char **argv, char **groups) { int result= 0; if (!mysql_client_init) diff --git a/plugin/auth_dialog/CMakeLists.txt b/plugin/auth_dialog/CMakeLists.txt index 7253b2b2f97..cdc961bb390 100644 --- a/plugin/auth_dialog/CMakeLists.txt +++ b/plugin/auth_dialog/CMakeLists.txt @@ -14,5 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -MYSQL_ADD_PLUGIN(dialog dialog.c ${CMAKE_SOURCE_DIR}/libmysql/get_password.c - MODULE_ONLY CLIENT COMPONENT ClientPlugins) +# disabled in favor of libmariadb/plugins/auth/dialog.c +# +#MYSQL_ADD_PLUGIN(dialog dialog.c ${CMAKE_SOURCE_DIR}/libmysql/get_password.c +# MODULE_ONLY CLIENT COMPONENT ClientPlugins) diff --git a/plugin/auth_examples/CMakeLists.txt b/plugin/auth_examples/CMakeLists.txt index d1152227eff..b5859f158d6 100644 --- a/plugin/auth_examples/CMakeLists.txt +++ b/plugin/auth_examples/CMakeLists.txt @@ -29,5 +29,8 @@ MYSQL_ADD_PLUGIN(qa_auth_client qa_auth_client.c MYSQL_ADD_PLUGIN(auth_0x0100 auth_0x0100.c MODULE_ONLY COMPONENT Test) -MYSQL_ADD_PLUGIN(mysql_clear_password clear_password_client.c - MODULE_ONLY CLIENT COMPONENT ClientPlugins) +# disabled in favor of +# libmariadb/plugins/auth/mariadb_cleartext.c +# +#MYSQL_ADD_PLUGIN(mysql_clear_password clear_password_client.c +# MODULE_ONLY CLIENT COMPONENT ClientPlugins) diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index 7d9e58e165f..d2f854c2918 100644 --- a/plugin/auth_gssapi/CMakeLists.txt +++ b/plugin/auth_gssapi/CMakeLists.txt @@ -38,8 +38,10 @@ MYSQL_ADD_PLUGIN(auth_gssapi server_plugin.cc ${GSSAPI_SERVER} ${GSSAPI_ERRMSG} COMPONENT gssapi-server MODULE_ONLY) -MYSQL_ADD_PLUGIN(auth_gssapi_client client_plugin.cc ${GSSAPI_CLIENT} ${GSSAPI_ERRMSG} - LINK_LIBRARIES ${GSSAPI_LIBS} - COMPONENT gssapi-client - CLIENT - MODULE_ONLY) +# disabled in favor of libmariadb/plugins/auth/auth_gssapi_client.c +# +#MYSQL_ADD_PLUGIN(auth_gssapi_client client_plugin.cc ${GSSAPI_CLIENT} ${GSSAPI_ERRMSG} +# LINK_LIBRARIES ${GSSAPI_LIBS COMPONENT ClientPlugins} +# COMPONENT gssapi-client +# CLIENT +# MODULE_ONLY) diff --git a/libmysql/conf_to_src.c b/sql-common/conf_to_src.c index 0e92388c93c..0e92388c93c 100644 --- a/libmysql/conf_to_src.c +++ b/sql-common/conf_to_src.c diff --git a/libmysql/errmsg.c b/sql-common/errmsg.c index fc5a6a07e11..fc5a6a07e11 100644 --- a/libmysql/errmsg.c +++ b/sql-common/errmsg.c diff --git a/libmysql/get_password.c b/sql-common/get_password.c index a113306ed57..a113306ed57 100644 --- a/libmysql/get_password.c +++ b/sql-common/get_password.c diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 40bd024b356..e6ccd8938df 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -79,7 +79,7 @@ ENDIF() SET (SQL_SOURCE ../sql-common/client.c compat56.cc derror.cc des_key_file.cc - discover.cc ../libmysql/errmsg.c field.cc field_conv.cc + discover.cc ../sql-common/errmsg.c field.cc field_conv.cc filesort_utils.cc filesort.cc gstream.cc sha2.cc signal_handler.cc |