From c7fa4a5be885c13689c021bce364041a47ccd890 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 24 Apr 2024 17:56:19 +0300
Subject: Release version 8.0.15+16

Add support for building with MinGW GCC.
---
 libmysqlclient/mysql/mysql                         |   1 -
 libmysqlclient/mysql/mysql/add_with_saturate.h     |   1 +
 libmysqlclient/mysql/mysql/base64.h                |   1 +
 libmysqlclient/mysql/mysql/big_endian.h            |   1 +
 libmysqlclient/mysql/mysql/c_string_less.h         |   1 +
 .../mysql/caching_sha2_passwordopt-longopts.h      |   1 +
 .../mysql/mysql/caching_sha2_passwordopt-vars.h    |   1 +
 libmysqlclient/mysql/mysql/crypt_genhash_impl.h    |   1 +
 libmysqlclient/mysql/mysql/decimal.h               |   1 +
 libmysqlclient/mysql/mysql/depth_first_search.h    |   1 +
 libmysqlclient/mysql/mysql/dur_prop.h              |   1 +
 libmysqlclient/mysql/mysql/errmsg.h                |   1 +
 libmysqlclient/mysql/mysql/ft_global.h             |   1 +
 libmysqlclient/mysql/mysql/heap.h                  |   1 +
 libmysqlclient/mysql/mysql/keycache.h              |   1 +
 libmysqlclient/mysql/mysql/lex_string.h            |   1 +
 libmysqlclient/mysql/mysql/lf.h                    |   1 +
 libmysqlclient/mysql/mysql/little_endian.h         |   1 +
 libmysqlclient/mysql/mysql/m_ctype.h               | 737 +++++++++++++++++++++
 libmysqlclient/mysql/mysql/m_ctype.h.orig          |   1 +
 libmysqlclient/mysql/mysql/m_string.h              |   1 +
 libmysqlclient/mysql/mysql/map_helpers.h           |   1 +
 libmysqlclient/mysql/mysql/memory_debugging.h      |   1 +
 libmysqlclient/mysql/mysql/mf_wcomp.h              |   1 +
 libmysqlclient/mysql/mysql/mutex_lock.h            |   1 +
 libmysqlclient/mysql/mysql/my_aes.h                |   1 +
 libmysqlclient/mysql/mysql/my_alloc.h              |   1 +
 libmysqlclient/mysql/mysql/my_atomic.h             |   1 +
 libmysqlclient/mysql/mysql/my_base.h               |   1 +
 libmysqlclient/mysql/mysql/my_basename.h           |   1 +
 libmysqlclient/mysql/mysql/my_bit.h                |   1 +
 libmysqlclient/mysql/mysql/my_bitmap.h             |   1 +
 libmysqlclient/mysql/mysql/my_byteorder.h          |   1 +
 libmysqlclient/mysql/mysql/my_check_opt.h          |   1 +
 libmysqlclient/mysql/mysql/my_command.h            |   1 +
 libmysqlclient/mysql/mysql/my_compare.h            |   1 +
 libmysqlclient/mysql/mysql/my_compiler.h           |   1 +
 libmysqlclient/mysql/mysql/my_dbug.h               |   1 +
 libmysqlclient/mysql/mysql/my_default.h            |   1 +
 libmysqlclient/mysql/mysql/my_dir.h                |  98 +++
 libmysqlclient/mysql/mysql/my_dir.h.orig           |   1 +
 libmysqlclient/mysql/mysql/my_double2ulonglong.h   |   1 +
 libmysqlclient/mysql/mysql/my_getopt.h             |   1 +
 libmysqlclient/mysql/mysql/my_hash_combine.h       |   1 +
 libmysqlclient/mysql/mysql/my_icp.h                |   1 +
 libmysqlclient/mysql/mysql/my_inttypes.h           |   1 +
 libmysqlclient/mysql/mysql/my_io.h                 |   1 +
 libmysqlclient/mysql/mysql/my_list.h               |   1 +
 libmysqlclient/mysql/mysql/my_loglevel.h           |   1 +
 libmysqlclient/mysql/mysql/my_macros.h             |   1 +
 libmysqlclient/mysql/mysql/my_md5.h                |   1 +
 libmysqlclient/mysql/mysql/my_md5_size.h           |   1 +
 libmysqlclient/mysql/mysql/my_murmur3.h            |   1 +
 libmysqlclient/mysql/mysql/my_pointer_arithmetic.h |   1 +
 libmysqlclient/mysql/mysql/my_psi_config.h         |   1 +
 libmysqlclient/mysql/mysql/my_rapidjson_size_t.h   |   1 +
 libmysqlclient/mysql/mysql/my_rdtsc.h              |   1 +
 libmysqlclient/mysql/mysql/my_rnd.h                |   1 +
 libmysqlclient/mysql/mysql/my_sharedlib.h          |   1 +
 libmysqlclient/mysql/mysql/my_shm_defaults.h       |   1 +
 libmysqlclient/mysql/mysql/my_sqlcommand.h         |   1 +
 libmysqlclient/mysql/mysql/my_stacktrace.h         |   1 +
 libmysqlclient/mysql/mysql/my_sys.h                |   1 +
 libmysqlclient/mysql/mysql/my_systime.h            |   1 +
 libmysqlclient/mysql/mysql/my_table_map.h          |   1 +
 libmysqlclient/mysql/mysql/my_thread.h             |   1 +
 libmysqlclient/mysql/mysql/my_thread_local.h       |   1 +
 libmysqlclient/mysql/mysql/my_thread_os_id.h       |   1 +
 libmysqlclient/mysql/mysql/my_time.h               |   1 +
 libmysqlclient/mysql/mysql/my_timer.h              |   1 +
 libmysqlclient/mysql/mysql/my_tree.h               |   1 +
 libmysqlclient/mysql/mysql/my_uctype.h             |   1 +
 libmysqlclient/mysql/mysql/my_user.h               |   1 +
 libmysqlclient/mysql/mysql/my_xml.h                |   1 +
 libmysqlclient/mysql/mysql/myisam.h                |   1 +
 libmysqlclient/mysql/mysql/myisammrg.h             |   1 +
 libmysqlclient/mysql/mysql/myisampack.h            |   1 +
 libmysqlclient/mysql/mysql/mysql.h                 |   1 +
 libmysqlclient/mysql/mysql/mysql/.gitattributes    |   1 +
 .../mysql/mysql/mysql/client_authentication.h      |   1 +
 libmysqlclient/mysql/mysql/mysql/client_plugin.h   |   1 +
 libmysqlclient/mysql/mysql/mysql/com_data.h        |   1 +
 .../mysql/components/component_implementation.h    |   1 +
 .../mysql/mysql/mysql/components/my_service.h      |   1 +
 .../mysql/mysql/mysql/components/service.h         |   1 +
 .../mysql/components/service_implementation.h      |   1 +
 .../services/audit_api_message_service.h           |   1 +
 .../components/services/backup_lock_service.h      |   1 +
 .../components/services/clone_protocol_service.h   |   1 +
 .../services/component_status_var_service.h        |   1 +
 .../services/component_sys_var_service.h           |   1 +
 .../mysql/components/services/dynamic_loader.h     |   1 +
 .../services/dynamic_loader_scheme_file.h          |   1 +
 .../mysql/components/services/dynamic_privilege.h  |   1 +
 .../services/group_member_status_listener.h        |   1 +
 .../services/group_membership_listener.h           |   1 +
 .../components/services/host_application_signal.h  |   1 +
 .../mysql/mysql/components/services/log_builtins.h |   1 +
 .../components/services/log_builtins_filter.h      |   1 +
 .../mysql/mysql/components/services/log_service.h  |   1 +
 .../mysql/mysql/components/services/log_shared.h   |   1 +
 .../services/my_host_application_signal.h          |   1 +
 .../mysql/mysql/components/services/my_io_bits.h   |  66 ++
 .../mysql/components/services/my_io_bits.h.orig    |   1 +
 .../mysql/components/services/my_thread_bits.h     |   1 +
 .../mysql/mysql/components/services/mysql_cond.h   |   1 +
 .../mysql/components/services/mysql_cond_bits.h    |   1 +
 .../mysql/components/services/mysql_cond_service.h |   1 +
 .../mysql/mysql/components/services/mysql_mutex.h  |   1 +
 .../mysql/components/services/mysql_mutex_bits.h   |   1 +
 .../components/services/mysql_mutex_service.h      |   1 +
 .../mysql/mysql/components/services/mysql_rwlock.h |   1 +
 .../mysql/components/services/mysql_rwlock_bits.h  |   1 +
 .../components/services/mysql_rwlock_service.h     |   1 +
 .../mysql/components/services/mysql_socket_bits.h  |   1 +
 .../mysql/mysql/components/services/mysql_string.h |   1 +
 .../services/ongoing_transaction_query_service.h   |   1 +
 .../services/persistent_dynamic_loader.h           |   1 +
 .../mysql/components/services/pfs_notification.h   |   1 +
 .../components/services/pfs_plugin_table_service.h |   1 +
 .../mysql/components/services/pfs_resource_group.h |   1 +
 .../mysql/mysql/components/services/psi_cond.h     |   1 +
 .../mysql/components/services/psi_cond_bits.h      |   1 +
 .../mysql/components/services/psi_cond_service.h   |   1 +
 .../mysql/mysql/components/services/psi_error.h    |   1 +
 .../mysql/components/services/psi_error_bits.h     |   1 +
 .../mysql/components/services/psi_error_service.h  |   1 +
 .../mysql/mysql/components/services/psi_file.h     |   1 +
 .../mysql/components/services/psi_file_bits.h      |   1 +
 .../mysql/components/services/psi_file_service.h   |   1 +
 .../mysql/mysql/components/services/psi_idle.h     |   1 +
 .../mysql/components/services/psi_idle_bits.h      |   1 +
 .../mysql/components/services/psi_idle_service.h   |   1 +
 .../mysql/mysql/components/services/psi_mdl.h      |   1 +
 .../mysql/mysql/components/services/psi_mdl_bits.h |   1 +
 .../mysql/components/services/psi_mdl_service.h    |   1 +
 .../mysql/mysql/components/services/psi_memory.h   |   1 +
 .../mysql/components/services/psi_memory_bits.h    |   1 +
 .../mysql/components/services/psi_memory_service.h |   1 +
 .../mysql/mysql/components/services/psi_mutex.h    |   1 +
 .../mysql/components/services/psi_mutex_bits.h     |   1 +
 .../mysql/components/services/psi_mutex_service.h  |   1 +
 .../mysql/mysql/components/services/psi_rwlock.h   |   1 +
 .../mysql/components/services/psi_rwlock_bits.h    |   1 +
 .../mysql/components/services/psi_rwlock_service.h |   1 +
 .../mysql/mysql/components/services/psi_socket.h   |   1 +
 .../mysql/components/services/psi_socket_bits.h    |   1 +
 .../mysql/components/services/psi_socket_service.h |   1 +
 .../mysql/mysql/components/services/psi_stage.h    |   1 +
 .../mysql/components/services/psi_stage_bits.h     |   1 +
 .../mysql/components/services/psi_stage_service.h  |   1 +
 .../mysql/components/services/psi_statement.h      |   1 +
 .../mysql/components/services/psi_statement_bits.h |   1 +
 .../components/services/psi_statement_service.h    |   1 +
 .../mysql/mysql/components/services/psi_system.h   |   1 +
 .../mysql/components/services/psi_system_bits.h    |   1 +
 .../mysql/components/services/psi_system_service.h |   1 +
 .../mysql/mysql/components/services/psi_table.h    |   1 +
 .../mysql/components/services/psi_table_bits.h     |   1 +
 .../mysql/components/services/psi_table_service.h  |   1 +
 .../mysql/mysql/components/services/psi_thread.h   |   1 +
 .../mysql/components/services/psi_thread_bits.h    |   1 +
 .../mysql/components/services/psi_thread_service.h |   1 +
 .../mysql/components/services/psi_transaction.h    |   1 +
 .../components/services/psi_transaction_bits.h     |   1 +
 .../components/services/psi_transaction_service.h  |   1 +
 .../mysql/mysql/components/services/registry.h     |   1 +
 .../mysql/components/services/security_context.h   |   1 +
 .../components/services/system_variable_source.h   |   1 +
 .../services/system_variable_source_type.h         |   1 +
 .../mysql/components/services/thr_cond_bits.h      |   1 +
 .../mysql/components/services/thr_mutex_bits.h     |   1 +
 .../mysql/components/services/thr_rwlock_bits.h    |   1 +
 .../mysql/components/services/udf_registration.h   |   1 +
 .../mysql/components/services/validate_password.h  |   1 +
 libmysqlclient/mysql/mysql/mysql/get_password.h    |   1 +
 .../mysql/mysql/mysql/group_replication_priv.h     |   1 +
 libmysqlclient/mysql/mysql/mysql/innodb_priv.h     |   1 +
 .../mysql/mysql/mysql/mysql_lex_string.h           |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin.h          |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_audit.h    |   1 +
 .../mysql/mysql/mysql/plugin_audit_message_types.h |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_auth.h     |   1 +
 .../mysql/mysql/mysql/plugin_auth_common.h         |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_clone.h    |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h |   1 +
 .../mysql/mysql/mysql/plugin_group_replication.h   |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_keyring.h  |   1 +
 .../mysql/mysql/mysql/plugin_query_rewrite.h       |   1 +
 libmysqlclient/mysql/mysql/mysql/plugin_trace.h    |   1 +
 .../mysql/mysql/mysql/plugin_validate_password.h   |   1 +
 libmysqlclient/mysql/mysql/mysql/psi               |   1 +
 libmysqlclient/mysql/mysql/mysql/service_command.h |   1 +
 libmysqlclient/mysql/mysql/mysql/service_locking.h |   1 +
 .../mysql/mysql/mysql/service_my_plugin_log.h      |   1 +
 .../mysql/mysql/mysql/service_mysql_alloc.h        |   1 +
 .../mysql/mysql/mysql/service_mysql_keyring.h      |   1 +
 .../mysql/mysql/service_mysql_password_policy.h    |   1 +
 .../mysql/mysql/mysql/service_mysql_string.h       |   1 +
 libmysqlclient/mysql/mysql/mysql/service_parser.h  |   1 +
 .../mysql/mysql/mysql/service_plugin_registry.h    |   1 +
 .../mysql/mysql/service_rpl_transaction_ctx.h      |   1 +
 .../mysql/service_rpl_transaction_write_set.h      |   1 +
 .../mysql/mysql/mysql/service_rules_table.h        |   1 +
 .../mysql/mysql/mysql/service_security_context.h   |   1 +
 .../mysql/mysql/mysql/service_srv_session.h        |   1 +
 .../mysql/mysql/mysql/service_srv_session_info.h   |   1 +
 .../mysql/mysql/mysql/service_ssl_wrapper.h        |   1 +
 .../mysql/mysql/mysql/service_thd_alloc.h          |   1 +
 .../mysql/mysql/mysql/service_thd_engine_lock.h    |   1 +
 .../mysql/mysql/mysql/service_thd_wait.h           |   1 +
 .../mysql/mysql/mysql/service_thread_scheduler.h   |   1 +
 libmysqlclient/mysql/mysql/mysql/services.h        |   1 +
 libmysqlclient/mysql/mysql/mysql/status_var.h      |   1 +
 .../mysql/mysql/mysql/thread_pool_priv.h           |   1 +
 libmysqlclient/mysql/mysql/mysql/thread_type.h     |   1 +
 .../mysql/mysql/mysql/udf_registration_types.h     |   1 +
 libmysqlclient/mysql/mysql/mysql_com.h             |   1 +
 libmysqlclient/mysql/mysql/mysql_com_server.h      |   1 +
 libmysqlclient/mysql/mysql/mysql_time.h            |   1 +
 libmysqlclient/mysql/mysql/mysys_err.h             |   1 +
 libmysqlclient/mysql/mysql/nullable.h              |   1 +
 libmysqlclient/mysql/mysql/password.h              |   1 +
 libmysqlclient/mysql/mysql/pfs_cond_provider.h     |   1 +
 libmysqlclient/mysql/mysql/pfs_error_provider.h    |   1 +
 libmysqlclient/mysql/mysql/pfs_file_provider.h     |   1 +
 libmysqlclient/mysql/mysql/pfs_idle_provider.h     |   1 +
 libmysqlclient/mysql/mysql/pfs_memory_provider.h   |   1 +
 libmysqlclient/mysql/mysql/pfs_metadata_provider.h |   1 +
 libmysqlclient/mysql/mysql/pfs_mutex_provider.h    |   1 +
 libmysqlclient/mysql/mysql/pfs_rwlock_provider.h   |   1 +
 libmysqlclient/mysql/mysql/pfs_socket_provider.h   |   1 +
 libmysqlclient/mysql/mysql/pfs_stage_provider.h    |   1 +
 .../mysql/mysql/pfs_statement_provider.h           |   1 +
 libmysqlclient/mysql/mysql/pfs_system_provider.h   |   1 +
 libmysqlclient/mysql/mysql/pfs_table_provider.h    |   1 +
 libmysqlclient/mysql/mysql/pfs_thread_provider.h   |   1 +
 .../mysql/mysql/pfs_transaction_provider.h         |   1 +
 libmysqlclient/mysql/mysql/prealloced_array.h      |   1 +
 libmysqlclient/mysql/mysql/print_version.h         |   1 +
 libmysqlclient/mysql/mysql/priority_queue.h        |   1 +
 libmysqlclient/mysql/mysql/rwlock_scoped_lock.h    |   1 +
 libmysqlclient/mysql/mysql/scope_guard.h           |   1 +
 libmysqlclient/mysql/mysql/service_versions.h      |   1 +
 libmysqlclient/mysql/mysql/sha1.h                  |   1 +
 libmysqlclient/mysql/mysql/sha2.h                  |   1 +
 libmysqlclient/mysql/mysql/sql_chars.h             |   1 +
 libmysqlclient/mysql/mysql/sql_common.h            |   1 +
 libmysqlclient/mysql/mysql/sql_string.h            |   1 +
 libmysqlclient/mysql/mysql/sslopt-case.h           |   1 +
 libmysqlclient/mysql/mysql/sslopt-longopts.h       |   1 +
 libmysqlclient/mysql/mysql/sslopt-vars.h           |   1 +
 libmysqlclient/mysql/mysql/template_utils.h        |   1 +
 libmysqlclient/mysql/mysql/thr_cond.h              |   1 +
 libmysqlclient/mysql/mysql/thr_lock.h              |   1 +
 libmysqlclient/mysql/mysql/thr_mutex.h             |   1 +
 libmysqlclient/mysql/mysql/thr_rwlock.h            |   1 +
 libmysqlclient/mysql/mysql/typelib.h               |   1 +
 libmysqlclient/mysql/mysql/unsafe_string_append.h  |   1 +
 libmysqlclient/mysql/mysql/varlen_sort.h           |   1 +
 libmysqlclient/mysql/mysql/violite.h               |   1 +
 .../mysql/mysql/welcome_copyright_notice.h         |   1 +
 .../mysql/mysql/wolfssl_fix_namespace_pollution.h  |   1 +
 .../mysql/wolfssl_fix_namespace_pollution_pre.h    |   1 +
 264 files changed, 1161 insertions(+), 1 deletion(-)
 delete mode 120000 libmysqlclient/mysql/mysql
 create mode 120000 libmysqlclient/mysql/mysql/add_with_saturate.h
 create mode 120000 libmysqlclient/mysql/mysql/base64.h
 create mode 120000 libmysqlclient/mysql/mysql/big_endian.h
 create mode 120000 libmysqlclient/mysql/mysql/c_string_less.h
 create mode 120000 libmysqlclient/mysql/mysql/caching_sha2_passwordopt-longopts.h
 create mode 120000 libmysqlclient/mysql/mysql/caching_sha2_passwordopt-vars.h
 create mode 120000 libmysqlclient/mysql/mysql/crypt_genhash_impl.h
 create mode 120000 libmysqlclient/mysql/mysql/decimal.h
 create mode 120000 libmysqlclient/mysql/mysql/depth_first_search.h
 create mode 120000 libmysqlclient/mysql/mysql/dur_prop.h
 create mode 120000 libmysqlclient/mysql/mysql/errmsg.h
 create mode 120000 libmysqlclient/mysql/mysql/ft_global.h
 create mode 120000 libmysqlclient/mysql/mysql/heap.h
 create mode 120000 libmysqlclient/mysql/mysql/keycache.h
 create mode 120000 libmysqlclient/mysql/mysql/lex_string.h
 create mode 120000 libmysqlclient/mysql/mysql/lf.h
 create mode 120000 libmysqlclient/mysql/mysql/little_endian.h
 create mode 100644 libmysqlclient/mysql/mysql/m_ctype.h
 create mode 120000 libmysqlclient/mysql/mysql/m_ctype.h.orig
 create mode 120000 libmysqlclient/mysql/mysql/m_string.h
 create mode 120000 libmysqlclient/mysql/mysql/map_helpers.h
 create mode 120000 libmysqlclient/mysql/mysql/memory_debugging.h
 create mode 120000 libmysqlclient/mysql/mysql/mf_wcomp.h
 create mode 120000 libmysqlclient/mysql/mysql/mutex_lock.h
 create mode 120000 libmysqlclient/mysql/mysql/my_aes.h
 create mode 120000 libmysqlclient/mysql/mysql/my_alloc.h
 create mode 120000 libmysqlclient/mysql/mysql/my_atomic.h
 create mode 120000 libmysqlclient/mysql/mysql/my_base.h
 create mode 120000 libmysqlclient/mysql/mysql/my_basename.h
 create mode 120000 libmysqlclient/mysql/mysql/my_bit.h
 create mode 120000 libmysqlclient/mysql/mysql/my_bitmap.h
 create mode 120000 libmysqlclient/mysql/mysql/my_byteorder.h
 create mode 120000 libmysqlclient/mysql/mysql/my_check_opt.h
 create mode 120000 libmysqlclient/mysql/mysql/my_command.h
 create mode 120000 libmysqlclient/mysql/mysql/my_compare.h
 create mode 120000 libmysqlclient/mysql/mysql/my_compiler.h
 create mode 120000 libmysqlclient/mysql/mysql/my_dbug.h
 create mode 120000 libmysqlclient/mysql/mysql/my_default.h
 create mode 100644 libmysqlclient/mysql/mysql/my_dir.h
 create mode 120000 libmysqlclient/mysql/mysql/my_dir.h.orig
 create mode 120000 libmysqlclient/mysql/mysql/my_double2ulonglong.h
 create mode 120000 libmysqlclient/mysql/mysql/my_getopt.h
 create mode 120000 libmysqlclient/mysql/mysql/my_hash_combine.h
 create mode 120000 libmysqlclient/mysql/mysql/my_icp.h
 create mode 120000 libmysqlclient/mysql/mysql/my_inttypes.h
 create mode 120000 libmysqlclient/mysql/mysql/my_io.h
 create mode 120000 libmysqlclient/mysql/mysql/my_list.h
 create mode 120000 libmysqlclient/mysql/mysql/my_loglevel.h
 create mode 120000 libmysqlclient/mysql/mysql/my_macros.h
 create mode 120000 libmysqlclient/mysql/mysql/my_md5.h
 create mode 120000 libmysqlclient/mysql/mysql/my_md5_size.h
 create mode 120000 libmysqlclient/mysql/mysql/my_murmur3.h
 create mode 120000 libmysqlclient/mysql/mysql/my_pointer_arithmetic.h
 create mode 120000 libmysqlclient/mysql/mysql/my_psi_config.h
 create mode 120000 libmysqlclient/mysql/mysql/my_rapidjson_size_t.h
 create mode 120000 libmysqlclient/mysql/mysql/my_rdtsc.h
 create mode 120000 libmysqlclient/mysql/mysql/my_rnd.h
 create mode 120000 libmysqlclient/mysql/mysql/my_sharedlib.h
 create mode 120000 libmysqlclient/mysql/mysql/my_shm_defaults.h
 create mode 120000 libmysqlclient/mysql/mysql/my_sqlcommand.h
 create mode 120000 libmysqlclient/mysql/mysql/my_stacktrace.h
 create mode 120000 libmysqlclient/mysql/mysql/my_sys.h
 create mode 120000 libmysqlclient/mysql/mysql/my_systime.h
 create mode 120000 libmysqlclient/mysql/mysql/my_table_map.h
 create mode 120000 libmysqlclient/mysql/mysql/my_thread.h
 create mode 120000 libmysqlclient/mysql/mysql/my_thread_local.h
 create mode 120000 libmysqlclient/mysql/mysql/my_thread_os_id.h
 create mode 120000 libmysqlclient/mysql/mysql/my_time.h
 create mode 120000 libmysqlclient/mysql/mysql/my_timer.h
 create mode 120000 libmysqlclient/mysql/mysql/my_tree.h
 create mode 120000 libmysqlclient/mysql/mysql/my_uctype.h
 create mode 120000 libmysqlclient/mysql/mysql/my_user.h
 create mode 120000 libmysqlclient/mysql/mysql/my_xml.h
 create mode 120000 libmysqlclient/mysql/mysql/myisam.h
 create mode 120000 libmysqlclient/mysql/mysql/myisammrg.h
 create mode 120000 libmysqlclient/mysql/mysql/myisampack.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql.h
 create mode 100644 libmysqlclient/mysql/mysql/mysql/.gitattributes
 create mode 120000 libmysqlclient/mysql/mysql/mysql/client_authentication.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/client_plugin.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/com_data.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/component_implementation.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/my_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/service_implementation.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/audit_api_message_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/backup_lock_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/clone_protocol_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/component_status_var_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/component_sys_var_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader_scheme_file.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/dynamic_privilege.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/group_member_status_listener.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/group_membership_listener.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/host_application_signal.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/log_builtins.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/log_builtins_filter.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/log_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/log_shared.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/my_host_application_signal.h
 create mode 100644 libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h.orig
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/my_thread_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_socket_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/mysql_string.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/ongoing_transaction_query_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/persistent_dynamic_loader.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/pfs_notification.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/pfs_plugin_table_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/pfs_resource_group.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_cond.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_error.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_error_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_error_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_file.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_file_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_file_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_idle.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_memory.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_socket.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_stage.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_statement.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_system.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_system_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_system_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_table.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_table_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_table_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_thread.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_service.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/registry.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/security_context.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source_type.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/thr_cond_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/thr_mutex_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/thr_rwlock_bits.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/udf_registration.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/components/services/validate_password.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/get_password.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/group_replication_priv.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/innodb_priv.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/mysql_lex_string.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_audit.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_audit_message_types.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_auth.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_auth_common.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_clone.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_group_replication.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_keyring.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_query_rewrite.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_trace.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/plugin_validate_password.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/psi
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_command.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_locking.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_my_plugin_log.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_mysql_alloc.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_mysql_keyring.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_mysql_password_policy.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_mysql_string.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_parser.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_plugin_registry.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_ctx.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_write_set.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_rules_table.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_security_context.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_srv_session.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_srv_session_info.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_ssl_wrapper.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_thd_alloc.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_thd_engine_lock.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_thd_wait.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/service_thread_scheduler.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/services.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/status_var.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/thread_pool_priv.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/thread_type.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql/udf_registration_types.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql_com.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql_com_server.h
 create mode 120000 libmysqlclient/mysql/mysql/mysql_time.h
 create mode 120000 libmysqlclient/mysql/mysql/mysys_err.h
 create mode 120000 libmysqlclient/mysql/mysql/nullable.h
 create mode 120000 libmysqlclient/mysql/mysql/password.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_cond_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_error_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_file_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_idle_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_memory_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_metadata_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_mutex_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_rwlock_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_socket_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_stage_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_statement_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_system_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_table_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_thread_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/pfs_transaction_provider.h
 create mode 120000 libmysqlclient/mysql/mysql/prealloced_array.h
 create mode 120000 libmysqlclient/mysql/mysql/print_version.h
 create mode 120000 libmysqlclient/mysql/mysql/priority_queue.h
 create mode 120000 libmysqlclient/mysql/mysql/rwlock_scoped_lock.h
 create mode 120000 libmysqlclient/mysql/mysql/scope_guard.h
 create mode 120000 libmysqlclient/mysql/mysql/service_versions.h
 create mode 120000 libmysqlclient/mysql/mysql/sha1.h
 create mode 120000 libmysqlclient/mysql/mysql/sha2.h
 create mode 120000 libmysqlclient/mysql/mysql/sql_chars.h
 create mode 120000 libmysqlclient/mysql/mysql/sql_common.h
 create mode 120000 libmysqlclient/mysql/mysql/sql_string.h
 create mode 120000 libmysqlclient/mysql/mysql/sslopt-case.h
 create mode 120000 libmysqlclient/mysql/mysql/sslopt-longopts.h
 create mode 120000 libmysqlclient/mysql/mysql/sslopt-vars.h
 create mode 120000 libmysqlclient/mysql/mysql/template_utils.h
 create mode 120000 libmysqlclient/mysql/mysql/thr_cond.h
 create mode 120000 libmysqlclient/mysql/mysql/thr_lock.h
 create mode 120000 libmysqlclient/mysql/mysql/thr_mutex.h
 create mode 120000 libmysqlclient/mysql/mysql/thr_rwlock.h
 create mode 120000 libmysqlclient/mysql/mysql/typelib.h
 create mode 120000 libmysqlclient/mysql/mysql/unsafe_string_append.h
 create mode 120000 libmysqlclient/mysql/mysql/varlen_sort.h
 create mode 120000 libmysqlclient/mysql/mysql/violite.h
 create mode 120000 libmysqlclient/mysql/mysql/welcome_copyright_notice.h
 create mode 120000 libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution.h
 create mode 120000 libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution_pre.h

(limited to 'libmysqlclient/mysql/mysql')

diff --git a/libmysqlclient/mysql/mysql b/libmysqlclient/mysql/mysql
deleted file mode 120000
index 01fbb48..0000000
--- a/libmysqlclient/mysql/mysql
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/include
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/add_with_saturate.h b/libmysqlclient/mysql/mysql/add_with_saturate.h
new file mode 120000
index 0000000..2318fa6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/add_with_saturate.h
@@ -0,0 +1 @@
+../../../upstream/include/add_with_saturate.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/base64.h b/libmysqlclient/mysql/mysql/base64.h
new file mode 120000
index 0000000..62c29f6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/base64.h
@@ -0,0 +1 @@
+../../../upstream/include/base64.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/big_endian.h b/libmysqlclient/mysql/mysql/big_endian.h
new file mode 120000
index 0000000..6e6dc5d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/big_endian.h
@@ -0,0 +1 @@
+../../../upstream/include/big_endian.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/c_string_less.h b/libmysqlclient/mysql/mysql/c_string_less.h
new file mode 120000
index 0000000..9ab37a8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/c_string_less.h
@@ -0,0 +1 @@
+../../../upstream/include/c_string_less.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-longopts.h b/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-longopts.h
new file mode 120000
index 0000000..64d1466
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-longopts.h
@@ -0,0 +1 @@
+../../../upstream/include/caching_sha2_passwordopt-longopts.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-vars.h b/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-vars.h
new file mode 120000
index 0000000..89fbae0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/caching_sha2_passwordopt-vars.h
@@ -0,0 +1 @@
+../../../upstream/include/caching_sha2_passwordopt-vars.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/crypt_genhash_impl.h b/libmysqlclient/mysql/mysql/crypt_genhash_impl.h
new file mode 120000
index 0000000..c33373a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/crypt_genhash_impl.h
@@ -0,0 +1 @@
+../../../upstream/include/crypt_genhash_impl.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/decimal.h b/libmysqlclient/mysql/mysql/decimal.h
new file mode 120000
index 0000000..a7e7c6f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/decimal.h
@@ -0,0 +1 @@
+../../../upstream/include/decimal.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/depth_first_search.h b/libmysqlclient/mysql/mysql/depth_first_search.h
new file mode 120000
index 0000000..238bb4b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/depth_first_search.h
@@ -0,0 +1 @@
+../../../upstream/include/depth_first_search.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/dur_prop.h b/libmysqlclient/mysql/mysql/dur_prop.h
new file mode 120000
index 0000000..ea44d4a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/dur_prop.h
@@ -0,0 +1 @@
+../../../upstream/include/dur_prop.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/errmsg.h b/libmysqlclient/mysql/mysql/errmsg.h
new file mode 120000
index 0000000..64a220a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/errmsg.h
@@ -0,0 +1 @@
+../../../upstream/include/errmsg.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/ft_global.h b/libmysqlclient/mysql/mysql/ft_global.h
new file mode 120000
index 0000000..01738bd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/ft_global.h
@@ -0,0 +1 @@
+../../../upstream/include/ft_global.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/heap.h b/libmysqlclient/mysql/mysql/heap.h
new file mode 120000
index 0000000..a395cdf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/heap.h
@@ -0,0 +1 @@
+../../../upstream/include/heap.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/keycache.h b/libmysqlclient/mysql/mysql/keycache.h
new file mode 120000
index 0000000..f2f3f6e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/keycache.h
@@ -0,0 +1 @@
+../../../upstream/include/keycache.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/lex_string.h b/libmysqlclient/mysql/mysql/lex_string.h
new file mode 120000
index 0000000..cc21faf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/lex_string.h
@@ -0,0 +1 @@
+../../../upstream/include/lex_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/lf.h b/libmysqlclient/mysql/mysql/lf.h
new file mode 120000
index 0000000..4ec9694
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/lf.h
@@ -0,0 +1 @@
+../../../upstream/include/lf.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/little_endian.h b/libmysqlclient/mysql/mysql/little_endian.h
new file mode 120000
index 0000000..01fba75
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/little_endian.h
@@ -0,0 +1 @@
+../../../upstream/include/little_endian.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/m_ctype.h b/libmysqlclient/mysql/mysql/m_ctype.h
new file mode 100644
index 0000000..a0afe7a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/m_ctype.h
@@ -0,0 +1,737 @@
+/* Copyright (c) 2000, 2018, 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, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   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, version 2.0, 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 */
+
+/**
+  @file include/m_ctype.h
+  A better implementation of the UNIX ctype(3) library.
+*/
+
+#ifndef _m_ctype_h
+#define _m_ctype_h
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+#include <stddef.h>
+#include <sys/types.h>
+
+#include "my_compiler.h"
+#include "my_inttypes.h"
+#include "my_loglevel.h"
+#include "my_macros.h"
+#include "my_sharedlib.h"
+
+#define MY_CS_NAME_SIZE 32
+#define MY_CS_CTYPE_TABLE_SIZE 257
+#define MY_CS_TO_LOWER_TABLE_SIZE 256
+#define MY_CS_TO_UPPER_TABLE_SIZE 256
+#define MY_CS_SORT_ORDER_TABLE_SIZE 256
+#define MY_CS_TO_UNI_TABLE_SIZE 256
+
+#define CHARSET_DIR "charsets/"
+
+/**
+  Our own version of wchar_t, ie., a type that holds a single Unicode code point
+  ("wide character"). ulong is always big enough to hold any character
+  in the BMP.
+*/
+typedef ulong my_wc_t;
+
+#define MY_CS_REPLACEMENT_CHARACTER 0xFFFD
+
+static inline void MY_PUT_MB2(unsigned char *s, uint16 code) {
+  s[0] = code >> 8;
+  s[1] = code & 0xFF;
+}
+
+typedef struct MY_UNICASE_CHARACTER {
+  uint32 toupper;
+  uint32 tolower;
+  uint32 sort;
+} MY_UNICASE_CHARACTER;
+
+typedef struct MY_UNICASE_INFO {
+  my_wc_t maxchar;
+  const MY_UNICASE_CHARACTER **page;
+} MY_UNICASE_INFO;
+
+extern MY_UNICASE_INFO my_unicase_default;
+extern MY_UNICASE_INFO my_unicase_turkish;
+extern MY_UNICASE_INFO my_unicase_mysql500;
+extern MY_UNICASE_INFO my_unicase_unicode520;
+
+struct MY_UCA_INFO;
+
+typedef struct MY_UNI_CTYPE {
+  uchar pctype;
+  uchar *ctype;
+} MY_UNI_CTYPE;
+
+extern MY_UNI_CTYPE my_uni_ctype[256];
+
+/* wm_wc and wc_mb return codes */
+#define MY_CS_ILSEQ 0        /* Wrong by sequence: wb_wc                   */
+#define MY_CS_ILUNI 0        /* Cannot encode Unicode to charset: wc_mb    */
+#define MY_CS_TOOSMALL -101  /* Need at least one byte:    wc_mb and mb_wc */
+#define MY_CS_TOOSMALL2 -102 /* Need at least two bytes:   wc_mb and mb_wc */
+#define MY_CS_TOOSMALL3 -103 /* Need at least three bytes: wc_mb and mb_wc */
+/* These following three are currently not really used */
+#define MY_CS_TOOSMALL4 -104 /* Need at least 4 bytes: wc_mb and mb_wc */
+#define MY_CS_TOOSMALL5 -105 /* Need at least 5 bytes: wc_mb and mb_wc */
+#define MY_CS_TOOSMALL6 -106 /* Need at least 6 bytes: wc_mb and mb_wc */
+/* A helper macros for "need at least n bytes" */
+#define MY_CS_TOOSMALLN(n) (-100 - (n))
+
+#define MY_SEQ_INTTAIL 1
+#define MY_SEQ_SPACES 2
+
+/* My charsets_list flags */
+#define MY_CS_COMPILED 1 /* compiled-in sets               */
+#define MY_CS_CONFIG 2   /* sets that have a *.conf file   */
+#define MY_CS_INDEX 4    /* sets listed in the Index file  */
+#define MY_CS_LOADED 8   /* sets that are currently loaded */
+#define MY_CS_BINSORT 16 /* if binary sort order           */
+#define MY_CS_PRIMARY 32 /* if primary collation           */
+#define MY_CS_STRNXFRM                                                         \
+  64                                   /*                                      \
+                                         if _not_ set, sort_order will         \
+                                         give same result as strnxfrm --       \
+                                         all new collations should have this   \
+                                         flag set, do not check it in new code \
+                                       */
+#define MY_CS_UNICODE 128              /* is a charset is BMP Unicode    */
+#define MY_CS_READY 256                /* if a charset is initialized    */
+#define MY_CS_AVAILABLE 512            /* If either compiled-in or loaded*/
+#define MY_CS_CSSORT 1024              /* if case sensitive sort order   */
+#define MY_CS_HIDDEN 2048              /* don't display in SHOW          */
+#define MY_CS_PUREASCII 4096           /* if a charset is pure ascii     */
+#define MY_CS_NONASCII 8192            /* if not ASCII-compatible        */
+#define MY_CS_UNICODE_SUPPLEMENT 16384 /* Non-BMP Unicode characters */
+#define MY_CS_LOWER_SORT 32768         /* If use lower case as weight   */
+#define MY_CHARSET_UNDEFINED 0
+
+/* Character repertoire flags */
+#define MY_REPERTOIRE_ASCII 1     /* Pure ASCII            U+0000..U+007F */
+#define MY_REPERTOIRE_EXTENDED 2  /* Extended characters:  U+0080..U+FFFF */
+#define MY_REPERTOIRE_UNICODE30 3 /* ASCII | EXTENDED:     U+0000..U+FFFF */
+
+/* Flags for strxfrm */
+#define MY_STRXFRM_PAD_TO_MAXLEN 0x00000080 /* if pad tail(for filesort) */
+
+typedef struct MY_UNI_IDX {
+  uint16 from;
+  uint16 to;
+  const uchar *tab;
+} MY_UNI_IDX;
+
+typedef struct {
+  uint beg;
+  uint end;
+  uint mb_len;
+} my_match_t;
+
+struct CHARSET_INFO;
+#ifndef __cplusplus
+typedef struct CHARSET_INFO CHARSET_INFO;
+#endif
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info;
+
+typedef struct MY_CHARSET_LOADER {
+  uint errcode;
+  char errarg[192];
+  void *(*once_alloc)(size_t);
+  void *(*mem_malloc)(size_t);
+  void *(*mem_realloc)(void *, size_t);
+  void (*mem_free)(void *);
+  void (*reporter)(enum loglevel, uint errcode, ...);
+  int (*add_collation)(CHARSET_INFO *cs);
+} MY_CHARSET_LOADER;
+
+extern int (*my_string_stack_guard)(int);
+
+enum Pad_attribute { PAD_SPACE, NO_PAD };
+
+/* See strings/CHARSET_INFO.txt for information about this structure  */
+typedef struct MY_COLLATION_HANDLER {
+  bool (*init)(CHARSET_INFO *, MY_CHARSET_LOADER *);
+  void (*uninit)(CHARSET_INFO *);
+  /* Collation routines */
+  int (*strnncoll)(const CHARSET_INFO *, const uchar *, size_t, const uchar *,
+                   size_t, bool);
+  /**
+    Compare the two strings under the pad rules given by the collation.
+
+    Thus, for NO PAD collations, this is identical to strnncoll with is_prefix
+    set to false. For PAD SPACE collations, the two strings are conceptually
+    extended infinitely at the end using space characters (0x20) and then
+    compared under the collation's normal comparison rules, so that e.g 'a' is
+    equal to 'a '.
+  */
+  int (*strnncollsp)(const CHARSET_INFO *, const uchar *, size_t, const uchar *,
+                     size_t);
+  /**
+    Transform the string into a form such that memcmp() between transformed
+    strings yields the correct collation order.
+
+    @param [out] dst Buffer for the transformed string.
+    @param [out] dstlen Number of bytes available in dstlen.
+      Must be even.
+    @param num_codepoints Treat the string as if it were of type
+      CHAR(num_codepoints). In particular, this means that if the
+      collation is a pad collation (pad_attribute is PAD_SPACE) and
+      string has fewer than "num_codepoints" codepoints, the string
+      will be transformed as if it ended in (num_codepoints-n) extra spaces.
+      If the string has more than "num_codepoints" codepoints,
+      behavior is undefined; may truncate, may crash, or do something
+      else entirely. Note that MY_STRXFRM_PAD_TO_MAXLEN overrides this;
+      if it is given for a PAD SPACE collation, this value is taken to be
+      effectively infinity.
+    @param src The source string, in the required character set
+      for the collation.
+    @param srclen Number of bytes in src.
+    @param flags ORed bitmask of MY_STRXFRM_* flags.
+
+    @return Number of bytes written to dst.
+  */
+  size_t (*strnxfrm)(const CHARSET_INFO *, uchar *dst, size_t dstlen,
+                     uint num_codepoints, const uchar *src, size_t srclen,
+                     uint flags);
+
+  /**
+    Return the maximum number of output bytes needed for strnxfrm()
+    to output all weights for any string of the given input length.
+    You can use this to e.g. size buffers for sort keys.
+
+    @param num_bytes Number of bytes in the input string. Note that for
+      multibyte character sets, this _must_ be a pessimistic estimate,
+      ie., one that's cs->mbmaxlen * max_num_codepoints. So for e.g.
+      the utf8mb4 string "foo", you will need to give in 12, not 3.
+  */
+  size_t (*strnxfrmlen)(const CHARSET_INFO *, size_t num_bytes);
+  bool (*like_range)(const CHARSET_INFO *, const char *s, size_t s_length,
+                     char w_prefix, char w_one, char w_many, size_t res_length,
+                     char *min_str, char *max_str, size_t *min_len,
+                     size_t *max_len);
+  int (*wildcmp)(const CHARSET_INFO *, const char *str, const char *str_end,
+                 const char *wildstr, const char *wildend, int escape,
+                 int w_one, int w_many);
+
+  int (*strcasecmp_)(const CHARSET_INFO *, const char *, const char *);
+
+  uint (*strstr)(const CHARSET_INFO *, const char *b, size_t b_length,
+                 const char *s, size_t s_length, my_match_t *match,
+                 uint nmatch);
+
+  /**
+    Compute a sort hash for the given key. This hash must preserve equality
+    under the given collation, so that a=b => H(a)=H(b). Note that this hash
+    is used for hash-based partitioning (PARTITION KEY), so you cannot change
+    it except when writing a new collation; it needs to be unchanged across
+    releases, so that the on-disk format does not change. (It is also used
+    for testing equality in the MEMORY storage engine.)
+
+    nr1 and nr2 are both in/out parameters. nr1 is the actual hash value;
+    nr2 holds extra state between invocations.
+  */
+  void (*hash_sort)(const CHARSET_INFO *cs, const uchar *key, size_t len,
+                    ulong *nr1, ulong *nr2);
+  bool (*propagate)(const CHARSET_INFO *cs, const uchar *str, size_t len);
+} MY_COLLATION_HANDLER;
+
+extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
+extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler;
+extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
+extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
+
+/* Some typedef to make it easy for C++ to make function pointers */
+typedef int (*my_charset_conv_mb_wc)(const CHARSET_INFO *, my_wc_t *,
+                                     const uchar *, const uchar *);
+typedef int (*my_charset_conv_wc_mb)(const CHARSET_INFO *, my_wc_t, uchar *,
+                                     uchar *);
+typedef size_t (*my_charset_conv_case)(const CHARSET_INFO *, char *, size_t,
+                                       char *, size_t);
+
+/* See strings/CHARSET_INFO.txt about information on this structure  */
+typedef struct MY_CHARSET_HANDLER {
+  bool (*init)(CHARSET_INFO *, MY_CHARSET_LOADER *loader);
+  /* Multibyte routines */
+  uint (*ismbchar)(const CHARSET_INFO *, const char *, const char *);
+  uint (*mbcharlen)(const CHARSET_INFO *, uint c);
+  size_t (*numchars)(const CHARSET_INFO *, const char *b, const char *e);
+
+  /**
+    Return at which byte codepoint number "pos" begins, relative to
+    the start of the string. If the string is shorter than or is
+    exactly "pos" codepoints long, returns a value equal or greater to
+    (e-b).
+  */
+  size_t (*charpos)(const CHARSET_INFO *, const char *b, const char *e,
+                    size_t pos);
+  size_t (*well_formed_len)(const CHARSET_INFO *, const char *b, const char *e,
+                            size_t nchars, int *error);
+  /**
+    Given a pointer and a length in bytes, returns a new length in bytes where
+    all trailing space characters are stripped. This holds even for NO PAD
+    collations.
+
+    Exception: The "binary" collation, which is used behind-the-scenes to
+    implement the BINARY type (by mapping it to CHAR(n) COLLATE "binary"),
+    returns just the length back with no stripping. It's done that way so that
+    Field_string (implementing CHAR(n)) returns the full padded width on read
+    (as opposed to a normal CHAR, where we usually strip the spaces on read),
+    but it's suboptimal, since lengthsp() is also used in a number of other
+    places, e.g. stripping trailing spaces from enum values given in by the
+    user. If you call this function, be aware of this special exception and
+    consider the implications.
+  */
+  size_t (*lengthsp)(const CHARSET_INFO *, const char *ptr, size_t length);
+  size_t (*numcells)(const CHARSET_INFO *, const char *b, const char *e);
+
+  /* Unicode conversion */
+  my_charset_conv_mb_wc mb_wc;
+  my_charset_conv_wc_mb wc_mb;
+
+  /* CTYPE scanner */
+  int (*ctype)(const CHARSET_INFO *cs, int *ctype, const uchar *s,
+               const uchar *e);
+
+  /* Functions for case and sort conversion */
+  size_t (*caseup_str)(const CHARSET_INFO *, char *);
+  size_t (*casedn_str)(const CHARSET_INFO *, char *);
+
+  my_charset_conv_case caseup;
+  my_charset_conv_case casedn;
+
+  /* Charset dependant snprintf() */
+  size_t (*snprintf)(const CHARSET_INFO *, char *to, size_t n, const char *fmt,
+                     ...) MY_ATTRIBUTE((format(printf, 4, 5)));
+  size_t (*long10_to_str)(const CHARSET_INFO *, char *to, size_t n, int radix,
+                          long int val);
+  size_t (*longlong10_to_str)(const CHARSET_INFO *, char *to, size_t n,
+                              int radix, longlong val);
+
+  void (*fill)(const CHARSET_INFO *, char *to, size_t len, int fill);
+
+  /* String-to-number conversion routines */
+  long (*strntol)(const CHARSET_INFO *, const char *s, size_t l, int base,
+                  char **e, int *err);
+  ulong (*strntoul)(const CHARSET_INFO *, const char *s, size_t l, int base,
+                    char **e, int *err);
+  longlong (*strntoll)(const CHARSET_INFO *, const char *s, size_t l, int base,
+                       char **e, int *err);
+  ulonglong (*strntoull)(const CHARSET_INFO *, const char *s, size_t l,
+                         int base, char **e, int *err);
+  double (*strntod)(const CHARSET_INFO *, char *s, size_t l, char **e,
+                    int *err);
+  longlong (*strtoll10)(const CHARSET_INFO *cs, const char *nptr, char **endptr,
+                        int *error);
+  ulonglong (*strntoull10rnd)(const CHARSET_INFO *cs, const char *str,
+                              size_t length, int unsigned_fl, char **endptr,
+                              int *error);
+  size_t (*scan)(const CHARSET_INFO *, const char *b, const char *e, int sq);
+} MY_CHARSET_HANDLER;
+
+extern MY_CHARSET_HANDLER my_charset_8bit_handler;
+extern MY_CHARSET_HANDLER my_charset_ascii_handler;
+extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
+
+/* See strings/CHARSET_INFO.txt about information on this structure  */
+struct CHARSET_INFO {
+  uint number;
+  uint primary_number;
+  uint binary_number;
+  uint state;
+  const char *csname;
+  const char *name;
+  const char *comment;
+  const char *tailoring;
+  struct Coll_param *coll_param;
+  const uchar *ctype;
+  const uchar *to_lower;
+  const uchar *to_upper;
+  const uchar *sort_order;
+  struct MY_UCA_INFO *uca; /* This can be changed in apply_one_rule() */
+  const uint16 *tab_to_uni;
+  const MY_UNI_IDX *tab_from_uni;
+  const MY_UNICASE_INFO *caseinfo;
+  const struct lex_state_maps_st *state_maps; /* parser internal data */
+  const uchar *ident_map;                     /* parser internal data */
+  uint strxfrm_multiply;
+  uchar caseup_multiply;
+  uchar casedn_multiply;
+  uint mbminlen;
+  uint mbmaxlen;
+  uint mbmaxlenlen;
+  my_wc_t min_sort_char;
+  my_wc_t max_sort_char; /* For LIKE optimization */
+  uchar pad_char;
+  bool escape_with_backslash_is_dangerous;
+  uchar levels_for_compare;
+
+  MY_CHARSET_HANDLER *cset;
+  MY_COLLATION_HANDLER *coll;
+
+  /**
+    If this collation is PAD_SPACE, it collates as if all inputs were
+    padded with a given number of spaces at the end (see the "num_codepoints"
+    flag to strnxfrm). NO_PAD simply compares unextended strings.
+
+    Note that this is fundamentally about the behavior of coll->strnxfrm.
+  */
+  enum Pad_attribute pad_attribute;
+};
+#define ILLEGAL_CHARSET_INFO_NUMBER (~0U)
+
+/*
+  NOTE: You cannot use a CHARSET_INFO without it having been initialized first.
+  In particular, they are not initialized when a unit test starts; do not use
+  these globals indiscriminately from there, and do not add more. Instead,
+  load them through a MY_CHARSET_LOADER, using my_collation_get_by_name().
+*/
+
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_bin;
+C_MODE_START
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_latin1;
+C_MODE_END
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_filename;
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8mb4_0900_ai_ci;
+
+extern CHARSET_INFO my_charset_latin1_bin;
+extern CHARSET_INFO my_charset_utf32_unicode_ci;
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8_general_ci;
+extern CHARSET_INFO my_charset_utf8_tolower_ci;
+extern CHARSET_INFO my_charset_utf8_unicode_ci;
+extern CHARSET_INFO my_charset_utf8_bin;
+extern CHARSET_INFO my_charset_utf8mb4_bin;
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8mb4_general_ci;
+
+#define MY_UTF8MB3 "utf8"
+#define MY_UTF8MB4 "utf8mb4"
+
+/* declarations for simple charsets */
+extern size_t my_strnxfrm_simple(const CHARSET_INFO *, uchar *dst,
+                                 size_t dstlen, uint nweights, const uchar *src,
+                                 size_t srclen, uint flags);
+size_t my_strnxfrmlen_simple(const CHARSET_INFO *, size_t);
+extern int my_strnncoll_simple(const CHARSET_INFO *, const uchar *, size_t,
+                               const uchar *, size_t, bool);
+
+extern int my_strnncollsp_simple(const CHARSET_INFO *, const uchar *, size_t,
+                                 const uchar *, size_t);
+
+extern void my_hash_sort_simple(const CHARSET_INFO *cs, const uchar *key,
+                                size_t len, ulong *nr1, ulong *nr2);
+
+extern size_t my_lengthsp_8bit(const CHARSET_INFO *cs, const char *ptr,
+                               size_t length);
+
+extern uint my_instr_simple(const CHARSET_INFO *, const char *b,
+                            size_t b_length, const char *s, size_t s_length,
+                            my_match_t *match, uint nmatch);
+
+/* Functions for 8bit */
+extern size_t my_caseup_str_8bit(const CHARSET_INFO *, char *);
+extern size_t my_casedn_str_8bit(const CHARSET_INFO *, char *);
+extern size_t my_caseup_8bit(const CHARSET_INFO *, char *src, size_t srclen,
+                             char *dst, size_t dstlen);
+extern size_t my_casedn_8bit(const CHARSET_INFO *, char *src, size_t srclen,
+                             char *dst, size_t dstlen);
+
+extern int my_strcasecmp_8bit(const CHARSET_INFO *cs, const char *,
+                              const char *);
+
+int my_mb_wc_8bit(const CHARSET_INFO *cs, my_wc_t *wc, const uchar *s,
+                  const uchar *e);
+int my_wc_mb_8bit(const CHARSET_INFO *cs, my_wc_t wc, uchar *s, uchar *e);
+
+int my_mb_ctype_8bit(const CHARSET_INFO *, int *, const uchar *, const uchar *);
+int my_mb_ctype_mb(const CHARSET_INFO *, int *, const uchar *, const uchar *);
+
+size_t my_scan_8bit(const CHARSET_INFO *cs, const char *b, const char *e,
+                    int sq);
+
+size_t my_snprintf_8bit(const CHARSET_INFO *, char *to, size_t n,
+                        const char *fmt, ...)
+    MY_ATTRIBUTE((format(printf, 4, 5)));
+
+long my_strntol_8bit(const CHARSET_INFO *, const char *s, size_t l, int base,
+                     char **e, int *err);
+ulong my_strntoul_8bit(const CHARSET_INFO *, const char *s, size_t l, int base,
+                       char **e, int *err);
+longlong my_strntoll_8bit(const CHARSET_INFO *, const char *s, size_t l,
+                          int base, char **e, int *err);
+ulonglong my_strntoull_8bit(const CHARSET_INFO *, const char *s, size_t l,
+                            int base, char **e, int *err);
+double my_strntod_8bit(const CHARSET_INFO *, char *s, size_t l, char **e,
+                       int *err);
+size_t my_long10_to_str_8bit(const CHARSET_INFO *, char *to, size_t l,
+                             int radix, long int val);
+size_t my_longlong10_to_str_8bit(const CHARSET_INFO *, char *to, size_t l,
+                                 int radix, longlong val);
+
+longlong my_strtoll10_8bit(const CHARSET_INFO *cs, const char *nptr,
+                           char **endptr, int *error);
+longlong my_strtoll10_ucs2(const CHARSET_INFO *cs, const char *nptr,
+                           char **endptr, int *error);
+
+ulonglong my_strntoull10rnd_8bit(const CHARSET_INFO *cs, const char *str,
+                                 size_t length, int unsigned_fl, char **endptr,
+                                 int *error);
+ulonglong my_strntoull10rnd_ucs2(const CHARSET_INFO *cs, const char *str,
+                                 size_t length, int unsigned_fl, char **endptr,
+                                 int *error);
+
+void my_fill_8bit(const CHARSET_INFO *cs, char *to, size_t l, int fill);
+
+/* For 8-bit character set */
+bool my_like_range_simple(const CHARSET_INFO *cs, const char *ptr,
+                          size_t ptr_length, char escape, char w_one,
+                          char w_many, size_t res_length, char *min_str,
+                          char *max_str, size_t *min_length,
+                          size_t *max_length);
+
+/* For ASCII-based multi-byte character sets with mbminlen=1 */
+bool my_like_range_mb(const CHARSET_INFO *cs, const char *ptr,
+                      size_t ptr_length, char escape, char w_one, char w_many,
+                      size_t res_length, char *min_str, char *max_str,
+                      size_t *min_length, size_t *max_length);
+
+/* For other character sets, with arbitrary mbminlen and mbmaxlen numbers */
+bool my_like_range_generic(const CHARSET_INFO *cs, const char *ptr,
+                           size_t ptr_length, char escape, char w_one,
+                           char w_many, size_t res_length, char *min_str,
+                           char *max_str, size_t *min_length,
+                           size_t *max_length);
+
+int my_wildcmp_8bit(const CHARSET_INFO *, const char *str, const char *str_end,
+                    const char *wildstr, const char *wildend, int escape,
+                    int w_one, int w_many);
+
+int my_wildcmp_bin(const CHARSET_INFO *, const char *str, const char *str_end,
+                   const char *wildstr, const char *wildend, int escape,
+                   int w_one, int w_many);
+
+size_t my_numchars_8bit(const CHARSET_INFO *, const char *b, const char *e);
+size_t my_numcells_8bit(const CHARSET_INFO *, const char *b, const char *e);
+size_t my_charpos_8bit(const CHARSET_INFO *, const char *b, const char *e,
+                       size_t pos);
+size_t my_well_formed_len_8bit(const CHARSET_INFO *, const char *b,
+                               const char *e, size_t pos, int *error);
+uint my_mbcharlen_8bit(const CHARSET_INFO *, uint c);
+
+/* Functions for multibyte charsets */
+extern size_t my_caseup_str_mb(const CHARSET_INFO *, char *);
+extern size_t my_casedn_str_mb(const CHARSET_INFO *, char *);
+extern size_t my_caseup_mb(const CHARSET_INFO *, char *src, size_t srclen,
+                           char *dst, size_t dstlen);
+extern size_t my_casedn_mb(const CHARSET_INFO *, char *src, size_t srclen,
+                           char *dst, size_t dstlen);
+extern size_t my_caseup_mb_varlen(const CHARSET_INFO *, char *src,
+                                  size_t srclen, char *dst, size_t dstlen);
+extern size_t my_casedn_mb_varlen(const CHARSET_INFO *, char *src,
+                                  size_t srclen, char *dst, size_t dstlen);
+extern size_t my_caseup_ujis(const CHARSET_INFO *, char *src, size_t srclen,
+                             char *dst, size_t dstlen);
+extern size_t my_casedn_ujis(const CHARSET_INFO *, char *src, size_t srclen,
+                             char *dst, size_t dstlen);
+extern int my_strcasecmp_mb(const CHARSET_INFO *cs, const char *, const char *);
+
+int my_wildcmp_mb(const CHARSET_INFO *, const char *str, const char *str_end,
+                  const char *wildstr, const char *wildend, int escape,
+                  int w_one, int w_many);
+size_t my_numchars_mb(const CHARSET_INFO *, const char *b, const char *e);
+size_t my_numcells_mb(const CHARSET_INFO *, const char *b, const char *e);
+size_t my_charpos_mb(const CHARSET_INFO *, const char *b, const char *e,
+                     size_t pos);
+size_t my_well_formed_len_mb(const CHARSET_INFO *, const char *b, const char *e,
+                             size_t pos, int *error);
+uint my_instr_mb(const CHARSET_INFO *, const char *b, size_t b_length,
+                 const char *s, size_t s_length, my_match_t *match,
+                 uint nmatch);
+
+int my_strnncoll_mb_bin(const CHARSET_INFO *cs, const uchar *s, size_t slen,
+                        const uchar *t, size_t tlen, bool t_is_prefix);
+
+int my_strnncollsp_mb_bin(const CHARSET_INFO *cs, const uchar *a,
+                          size_t a_length, const uchar *b, size_t b_length);
+
+int my_wildcmp_mb_bin(const CHARSET_INFO *cs, const char *str,
+                      const char *str_end, const char *wildstr,
+                      const char *wildend, int escape, int w_one, int w_many);
+
+int my_strcasecmp_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+                         const char *s, const char *t);
+
+void my_hash_sort_mb_bin(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+                         const uchar *key, size_t len, ulong *nr1, ulong *nr2);
+
+size_t my_strnxfrm_mb(const CHARSET_INFO *, uchar *dst, size_t dstlen,
+                      uint nweights, const uchar *src, size_t srclen,
+                      uint flags);
+
+size_t my_strnxfrm_unicode(const CHARSET_INFO *, uchar *dst, size_t dstlen,
+                           uint nweights, const uchar *src, size_t srclen,
+                           uint flags);
+
+size_t my_strnxfrm_unicode_full_bin(const CHARSET_INFO *, uchar *dst,
+                                    size_t dstlen, uint nweights,
+                                    const uchar *src, size_t srclen,
+                                    uint flags);
+size_t my_strnxfrmlen_unicode_full_bin(const CHARSET_INFO *, size_t);
+
+int my_wildcmp_unicode(const CHARSET_INFO *cs, const char *str,
+                       const char *str_end, const char *wildstr,
+                       const char *wildend, int escape, int w_one, int w_many,
+                       const MY_UNICASE_INFO *weights);
+
+extern bool my_parse_charset_xml(MY_CHARSET_LOADER *loader, const char *buf,
+                                 size_t buflen);
+extern char *my_strchr(const CHARSET_INFO *cs, const char *str, const char *end,
+                       char c);
+extern size_t my_strcspn(const CHARSET_INFO *cs, const char *str,
+                         const char *end, const char *reject,
+                         size_t reject_length);
+
+bool my_propagate_simple(const CHARSET_INFO *cs, const uchar *str, size_t len);
+bool my_propagate_complex(const CHARSET_INFO *cs, const uchar *str, size_t len);
+
+uint my_string_repertoire(const CHARSET_INFO *cs, const char *str, size_t len);
+bool my_charset_is_ascii_based(const CHARSET_INFO *cs);
+bool my_charset_is_8bit_pure_ascii(const CHARSET_INFO *cs);
+uint my_charset_repertoire(const CHARSET_INFO *cs);
+
+uint my_strxfrm_flag_normalize(uint flags);
+size_t my_strxfrm_pad(const CHARSET_INFO *cs, uchar *str, uchar *frmend,
+                      uchar *strend, uint nweights, uint flags);
+
+bool my_charset_is_ascii_compatible(const CHARSET_INFO *cs);
+
+size_t my_convert(char *to, size_t to_length, const CHARSET_INFO *to_cs,
+                  const char *from, size_t from_length,
+                  const CHARSET_INFO *from_cs, uint *errors);
+
+uint my_mbcharlen_ptr(const CHARSET_INFO *cs, const char *s, const char *e);
+
+bool my_is_prefixidx_cand(const CHARSET_INFO *cs, const char *wildstr,
+                          const char *wildend, int escape, int w_many,
+                          size_t *prefix_len);
+
+#define _MY_U 01    /* Upper case */
+#define _MY_L 02    /* Lower case */
+#define _MY_NMR 04  /* Numeral (digit) */
+#define _MY_SPC 010 /* Spacing character */
+#define _MY_PNT 020 /* Punctuation */
+#define _MY_CTR 040 /* Control character */
+#define _MY_B 0100  /* Blank */
+#define _MY_X 0200  /* heXadecimal digit */
+
+/* The following macros makes sense only for one-byte character sets.
+They will not fail for multibyte character sets, but will not produce
+the expected results. They may have som limited usability like
+e.g. for utf8mb3/utf8mb4, meaningful results will be produced for
+values < 0x7F. */
+#define my_isascii(c) (!((c) & ~0177))
+#define my_toupper(s, c) (char)((s)->to_upper[(uchar)(c)])
+#define my_tolower(s, c) (char)((s)->to_lower[(uchar)(c)])
+#define my_isalpha(s, c) (((s)->ctype + 1)[(uchar)(c)] & (_MY_U | _MY_L))
+#define my_isupper(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_U)
+#define my_islower(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_L)
+#define my_isdigit(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_NMR)
+#define my_isxdigit(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_X)
+#define my_isalnum(s, c) \
+  (((s)->ctype + 1)[(uchar)(c)] & (_MY_U | _MY_L | _MY_NMR))
+#define my_isspace(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_SPC)
+#define my_ispunct(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_PNT)
+#define my_isprint(s, c) \
+  (((s)->ctype + 1)[(uchar)(c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B))
+#define my_isgraph(s, c) \
+  (((s)->ctype + 1)[(uchar)(c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR))
+#define my_iscntrl(s, c) (((s)->ctype + 1)[(uchar)(c)] & _MY_CTR)
+
+/* Some macros that should be cleaned up a little */
+#define my_isvar(s, c) (my_isalnum(s, c) || (c) == '_')
+#define my_isvar_start(s, c) (my_isalpha(s, c) || (c) == '_')
+
+#define my_binary_compare(s) ((s)->state & MY_CS_BINSORT)
+#define use_strnxfrm(s) ((s)->state & MY_CS_STRNXFRM)
+#define my_strnxfrm(cs, d, dl, s, sl) \
+  ((cs)->coll->strnxfrm((cs), (d), (dl), (dl), (s), (sl), 0))
+#define my_strnncoll(s, a, b, c, d) \
+  ((s)->coll->strnncoll((s), (a), (b), (c), (d), 0))
+#define my_like_range(s, a, b, c, d, e, f, g, h, i, j) \
+  ((s)->coll->like_range((s), (a), (b), (c), (d), (e), (f), (g), (h), (i), (j)))
+#define my_wildcmp(cs, s, se, w, we, e, o, m) \
+  ((cs)->coll->wildcmp((cs), (s), (se), (w), (we), (e), (o), (m)))
+#define my_strcasecmp(s, a, b) ((s)->coll->strcasecmp_((s), (a), (b)))
+#define my_charpos(cs, b, e, num) \
+  (cs)->cset->charpos((cs), (const char *)(b), (const char *)(e), (num))
+
+#define use_mb(s) ((s)->cset->ismbchar != NULL)
+#define my_ismbchar(s, a, b) ((s)->cset->ismbchar((s), (a), (b)))
+#define my_mbcharlen(s, a) ((s)->cset->mbcharlen((s), (a)))
+/**
+  Get the length of gb18030 code by the given two leading bytes
+
+  @param[in] s charset_info
+  @param[in] a first byte of gb18030 code
+  @param[in] b second byte of gb18030 code
+  @return    the length of gb18030 code starting with given two bytes,
+             the length would be 2 or 4 for valid gb18030 code,
+             or 0 for invalid gb18030 code
+*/
+#define my_mbcharlen_2(s, a, b) \
+  ((s)->cset->mbcharlen((s), ((((a)&0xFF) << 8) + ((b)&0xFF))))
+/**
+  Get the maximum length of leading bytes needed to determine the length of a
+  multi-byte gb18030 code
+
+  @param[in] s charset_info
+  @return    number of leading bytes we need, would be 2 for gb18030
+             and 1 for all other charsets
+*/
+#define my_mbmaxlenlen(s) ((s)->mbmaxlenlen)
+/**
+  Judge if the given byte is a possible leading byte for a charset.
+  For gb18030 whose mbmaxlenlen is 2, we can't determine the length of
+  a multi-byte character by looking at the first byte only
+
+  @param[in] s charset_info
+  @param[in] i possible leading byte
+  @return    true if it is, otherwise false
+*/
+#define my_ismb1st(s, i)         \
+  (my_mbcharlen((s), (i)) > 1 || \
+   (my_mbmaxlenlen((s)) == 2 && my_mbcharlen((s), (i)) == 0))
+
+#define my_caseup_str(s, a) ((s)->cset->caseup_str((s), (a)))
+#define my_casedn_str(s, a) ((s)->cset->casedn_str((s), (a)))
+#define my_strntol(s, a, b, c, d, e) \
+  ((s)->cset->strntol((s), (a), (b), (c), (d), (e)))
+#define my_strntoul(s, a, b, c, d, e) \
+  ((s)->cset->strntoul((s), (a), (b), (c), (d), (e)))
+#define my_strntoll(s, a, b, c, d, e) \
+  ((s)->cset->strntoll((s), (a), (b), (c), (d), (e)))
+#define my_strntoull(s, a, b, c, d, e) \
+  ((s)->cset->strntoull((s), (a), (b), (c), (d), (e)))
+#define my_strntod(s, a, b, c, d) ((s)->cset->strntod((s), (a), (b), (c), (d)))
+
+#endif /* _m_ctype_h */
diff --git a/libmysqlclient/mysql/mysql/m_ctype.h.orig b/libmysqlclient/mysql/mysql/m_ctype.h.orig
new file mode 120000
index 0000000..dcf19c6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/m_ctype.h.orig
@@ -0,0 +1 @@
+../../../upstream/include/m_ctype.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/m_string.h b/libmysqlclient/mysql/mysql/m_string.h
new file mode 120000
index 0000000..5ad94f8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/m_string.h
@@ -0,0 +1 @@
+../../../upstream/include/m_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/map_helpers.h b/libmysqlclient/mysql/mysql/map_helpers.h
new file mode 120000
index 0000000..d0882ec
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/map_helpers.h
@@ -0,0 +1 @@
+../../../upstream/include/map_helpers.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/memory_debugging.h b/libmysqlclient/mysql/mysql/memory_debugging.h
new file mode 120000
index 0000000..34551ff
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/memory_debugging.h
@@ -0,0 +1 @@
+../../../upstream/include/memory_debugging.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mf_wcomp.h b/libmysqlclient/mysql/mysql/mf_wcomp.h
new file mode 120000
index 0000000..6b39784
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mf_wcomp.h
@@ -0,0 +1 @@
+../../../upstream/include/mf_wcomp.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mutex_lock.h b/libmysqlclient/mysql/mysql/mutex_lock.h
new file mode 120000
index 0000000..dc143bd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mutex_lock.h
@@ -0,0 +1 @@
+../../../upstream/include/mutex_lock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_aes.h b/libmysqlclient/mysql/mysql/my_aes.h
new file mode 120000
index 0000000..eefe440
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_aes.h
@@ -0,0 +1 @@
+../../../upstream/include/my_aes.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_alloc.h b/libmysqlclient/mysql/mysql/my_alloc.h
new file mode 120000
index 0000000..9652473
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_alloc.h
@@ -0,0 +1 @@
+../../../upstream/include/my_alloc.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_atomic.h b/libmysqlclient/mysql/mysql/my_atomic.h
new file mode 120000
index 0000000..eef2655
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_atomic.h
@@ -0,0 +1 @@
+../../../upstream/include/my_atomic.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_base.h b/libmysqlclient/mysql/mysql/my_base.h
new file mode 120000
index 0000000..6013958
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_base.h
@@ -0,0 +1 @@
+../../../upstream/include/my_base.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_basename.h b/libmysqlclient/mysql/mysql/my_basename.h
new file mode 120000
index 0000000..0da0827
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_basename.h
@@ -0,0 +1 @@
+../../../upstream/include/my_basename.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_bit.h b/libmysqlclient/mysql/mysql/my_bit.h
new file mode 120000
index 0000000..fc08b57
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_bit.h
@@ -0,0 +1 @@
+../../../upstream/include/my_bit.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_bitmap.h b/libmysqlclient/mysql/mysql/my_bitmap.h
new file mode 120000
index 0000000..4cdce99
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_bitmap.h
@@ -0,0 +1 @@
+../../../upstream/include/my_bitmap.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_byteorder.h b/libmysqlclient/mysql/mysql/my_byteorder.h
new file mode 120000
index 0000000..e407b84
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_byteorder.h
@@ -0,0 +1 @@
+../../../upstream/include/my_byteorder.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_check_opt.h b/libmysqlclient/mysql/mysql/my_check_opt.h
new file mode 120000
index 0000000..b2d2675
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_check_opt.h
@@ -0,0 +1 @@
+../../../upstream/include/my_check_opt.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_command.h b/libmysqlclient/mysql/mysql/my_command.h
new file mode 120000
index 0000000..a299658
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_command.h
@@ -0,0 +1 @@
+../../../upstream/include/my_command.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_compare.h b/libmysqlclient/mysql/mysql/my_compare.h
new file mode 120000
index 0000000..bfa1af7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_compare.h
@@ -0,0 +1 @@
+../../../upstream/include/my_compare.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_compiler.h b/libmysqlclient/mysql/mysql/my_compiler.h
new file mode 120000
index 0000000..73cd26a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_compiler.h
@@ -0,0 +1 @@
+../../../upstream/include/my_compiler.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_dbug.h b/libmysqlclient/mysql/mysql/my_dbug.h
new file mode 120000
index 0000000..e3ef7f4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_dbug.h
@@ -0,0 +1 @@
+../../../upstream/include/my_dbug.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_default.h b/libmysqlclient/mysql/mysql/my_default.h
new file mode 120000
index 0000000..772185e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_default.h
@@ -0,0 +1 @@
+../../../upstream/include/my_default.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_dir.h b/libmysqlclient/mysql/mysql/my_dir.h
new file mode 100644
index 0000000..c4656b7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_dir.h
@@ -0,0 +1,98 @@
+/* Copyright (c) 2000, 2017, 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, version 2.0,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   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, version 2.0, 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 */
+
+#ifndef MY_DIR_H
+#define MY_DIR_H
+
+/**
+  @file include/my_dir.h
+*/
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "my_inttypes.h"
+
+/* Defines for my_dir and my_stat */
+
+#ifdef _WIN32
+#ifndef __MINGW32__
+#define S_IROTH _S_IREAD
+#define S_IFIFO _S_IFIFO
+#endif
+#endif
+
+#define MY_S_IFMT S_IFMT     /* type of file */
+#define MY_S_IFDIR S_IFDIR   /* directory */
+#define MY_S_IFCHR S_IFCHR   /* character special */
+#define MY_S_IFBLK S_IFBLK   /* block special */
+#define MY_S_IFREG S_IFREG   /* regular */
+#define MY_S_IFIFO S_IFIFO   /* fifo */
+#define MY_S_ISUID S_ISUID   /* set user id on execution */
+#define MY_S_ISGID S_ISGID   /* set group id on execution */
+#define MY_S_ISVTX S_ISVTX   /* save swapped text even after use */
+#define MY_S_IREAD S_IREAD   /* read permission, owner */
+#define MY_S_IWRITE S_IWRITE /* write permission, owner */
+#define MY_S_IEXEC S_IEXEC   /* execute/search permission, owner */
+
+#define MY_S_ISDIR(m) (((m)&MY_S_IFMT) == MY_S_IFDIR)
+#define MY_S_ISCHR(m) (((m)&MY_S_IFMT) == MY_S_IFCHR)
+#define MY_S_ISBLK(m) (((m)&MY_S_IFMT) == MY_S_IFBLK)
+#define MY_S_ISREG(m) (((m)&MY_S_IFMT) == MY_S_IFREG)
+#define MY_S_ISFIFO(m) (((m)&MY_S_IFMT) == MY_S_IFIFO)
+
+#define MY_DONT_SORT 512  /* my_lib; Don't sort files */
+#define MY_WANT_STAT 1024 /* my_lib; stat files */
+
+/* typedefs for my_dir & my_stat */
+
+#ifdef _WIN32
+#define MY_STAT struct _stati64 /* 64 bit file size */
+#else
+#define MY_STAT struct stat /* Orginal struct have what we need */
+#endif
+
+/* Struct describing one file returned from my_dir */
+typedef struct fileinfo {
+  char *name;
+  MY_STAT *mystat;
+} FILEINFO;
+
+struct MY_DIR /* Struct returned from my_dir */
+{
+  /*
+    These members are just copies of parts of Prealloced_array structure,
+    which is allocated right after the end of MY_DIR structure (MEM_ROOT
+    for storing names is also resides there). We've left them here because
+    we don't want to change code that uses my_dir.
+  */
+  struct fileinfo *dir_entry;
+  uint number_off_files;
+};
+
+extern MY_DIR *my_dir(const char *path, myf MyFlags);
+extern void my_dirend(MY_DIR *buffer);
+extern MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags);
+extern int my_fstat(int filenr, MY_STAT *stat_area);
+
+#endif /* MY_DIR_H */
diff --git a/libmysqlclient/mysql/mysql/my_dir.h.orig b/libmysqlclient/mysql/mysql/my_dir.h.orig
new file mode 120000
index 0000000..8c3dbd5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_dir.h.orig
@@ -0,0 +1 @@
+../../../upstream/include/my_dir.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_double2ulonglong.h b/libmysqlclient/mysql/mysql/my_double2ulonglong.h
new file mode 120000
index 0000000..4c78b10
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_double2ulonglong.h
@@ -0,0 +1 @@
+../../../upstream/include/my_double2ulonglong.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_getopt.h b/libmysqlclient/mysql/mysql/my_getopt.h
new file mode 120000
index 0000000..37598e8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_getopt.h
@@ -0,0 +1 @@
+../../../upstream/include/my_getopt.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_hash_combine.h b/libmysqlclient/mysql/mysql/my_hash_combine.h
new file mode 120000
index 0000000..0f94bcd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_hash_combine.h
@@ -0,0 +1 @@
+../../../upstream/include/my_hash_combine.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_icp.h b/libmysqlclient/mysql/mysql/my_icp.h
new file mode 120000
index 0000000..1d56156
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_icp.h
@@ -0,0 +1 @@
+../../../upstream/include/my_icp.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_inttypes.h b/libmysqlclient/mysql/mysql/my_inttypes.h
new file mode 120000
index 0000000..9c9e4cf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_inttypes.h
@@ -0,0 +1 @@
+../../../upstream/include/my_inttypes.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_io.h b/libmysqlclient/mysql/mysql/my_io.h
new file mode 120000
index 0000000..b9905d4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_io.h
@@ -0,0 +1 @@
+../../../upstream/include/my_io.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_list.h b/libmysqlclient/mysql/mysql/my_list.h
new file mode 120000
index 0000000..ecd29d8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_list.h
@@ -0,0 +1 @@
+../../../upstream/include/my_list.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_loglevel.h b/libmysqlclient/mysql/mysql/my_loglevel.h
new file mode 120000
index 0000000..04ab334
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_loglevel.h
@@ -0,0 +1 @@
+../../../upstream/include/my_loglevel.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_macros.h b/libmysqlclient/mysql/mysql/my_macros.h
new file mode 120000
index 0000000..5afce59
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_macros.h
@@ -0,0 +1 @@
+../../../upstream/include/my_macros.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_md5.h b/libmysqlclient/mysql/mysql/my_md5.h
new file mode 120000
index 0000000..3804930
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_md5.h
@@ -0,0 +1 @@
+../../../upstream/include/my_md5.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_md5_size.h b/libmysqlclient/mysql/mysql/my_md5_size.h
new file mode 120000
index 0000000..080832d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_md5_size.h
@@ -0,0 +1 @@
+../../../upstream/include/my_md5_size.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_murmur3.h b/libmysqlclient/mysql/mysql/my_murmur3.h
new file mode 120000
index 0000000..07e095e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_murmur3.h
@@ -0,0 +1 @@
+../../../upstream/include/my_murmur3.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_pointer_arithmetic.h b/libmysqlclient/mysql/mysql/my_pointer_arithmetic.h
new file mode 120000
index 0000000..e98f419
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_pointer_arithmetic.h
@@ -0,0 +1 @@
+../../../upstream/include/my_pointer_arithmetic.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_psi_config.h b/libmysqlclient/mysql/mysql/my_psi_config.h
new file mode 120000
index 0000000..6fc76dd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_psi_config.h
@@ -0,0 +1 @@
+../../../upstream/include/my_psi_config.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_rapidjson_size_t.h b/libmysqlclient/mysql/mysql/my_rapidjson_size_t.h
new file mode 120000
index 0000000..fe5e84c
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_rapidjson_size_t.h
@@ -0,0 +1 @@
+../../../upstream/include/my_rapidjson_size_t.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_rdtsc.h b/libmysqlclient/mysql/mysql/my_rdtsc.h
new file mode 120000
index 0000000..efb6b20
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_rdtsc.h
@@ -0,0 +1 @@
+../../../upstream/include/my_rdtsc.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_rnd.h b/libmysqlclient/mysql/mysql/my_rnd.h
new file mode 120000
index 0000000..c62b464
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_rnd.h
@@ -0,0 +1 @@
+../../../upstream/include/my_rnd.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_sharedlib.h b/libmysqlclient/mysql/mysql/my_sharedlib.h
new file mode 120000
index 0000000..2764ea0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_sharedlib.h
@@ -0,0 +1 @@
+../../../upstream/include/my_sharedlib.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_shm_defaults.h b/libmysqlclient/mysql/mysql/my_shm_defaults.h
new file mode 120000
index 0000000..2057675
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_shm_defaults.h
@@ -0,0 +1 @@
+../../../upstream/include/my_shm_defaults.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_sqlcommand.h b/libmysqlclient/mysql/mysql/my_sqlcommand.h
new file mode 120000
index 0000000..2815046
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_sqlcommand.h
@@ -0,0 +1 @@
+../../../upstream/include/my_sqlcommand.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_stacktrace.h b/libmysqlclient/mysql/mysql/my_stacktrace.h
new file mode 120000
index 0000000..6071e6d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_stacktrace.h
@@ -0,0 +1 @@
+../../../upstream/include/my_stacktrace.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_sys.h b/libmysqlclient/mysql/mysql/my_sys.h
new file mode 120000
index 0000000..ec1a911
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_sys.h
@@ -0,0 +1 @@
+../../../upstream/include/my_sys.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_systime.h b/libmysqlclient/mysql/mysql/my_systime.h
new file mode 120000
index 0000000..e4b4f8d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_systime.h
@@ -0,0 +1 @@
+../../../upstream/include/my_systime.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_table_map.h b/libmysqlclient/mysql/mysql/my_table_map.h
new file mode 120000
index 0000000..c858e96
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_table_map.h
@@ -0,0 +1 @@
+../../../upstream/include/my_table_map.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_thread.h b/libmysqlclient/mysql/mysql/my_thread.h
new file mode 120000
index 0000000..427206a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_thread.h
@@ -0,0 +1 @@
+../../../upstream/include/my_thread.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_thread_local.h b/libmysqlclient/mysql/mysql/my_thread_local.h
new file mode 120000
index 0000000..edaf153
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_thread_local.h
@@ -0,0 +1 @@
+../../../upstream/include/my_thread_local.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_thread_os_id.h b/libmysqlclient/mysql/mysql/my_thread_os_id.h
new file mode 120000
index 0000000..3943fb6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_thread_os_id.h
@@ -0,0 +1 @@
+../../../upstream/include/my_thread_os_id.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_time.h b/libmysqlclient/mysql/mysql/my_time.h
new file mode 120000
index 0000000..ef0f831
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_time.h
@@ -0,0 +1 @@
+../../../upstream/include/my_time.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_timer.h b/libmysqlclient/mysql/mysql/my_timer.h
new file mode 120000
index 0000000..304b864
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_timer.h
@@ -0,0 +1 @@
+../../../upstream/include/my_timer.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_tree.h b/libmysqlclient/mysql/mysql/my_tree.h
new file mode 120000
index 0000000..527f964
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_tree.h
@@ -0,0 +1 @@
+../../../upstream/include/my_tree.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_uctype.h b/libmysqlclient/mysql/mysql/my_uctype.h
new file mode 120000
index 0000000..52c8779
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_uctype.h
@@ -0,0 +1 @@
+../../../upstream/include/my_uctype.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_user.h b/libmysqlclient/mysql/mysql/my_user.h
new file mode 120000
index 0000000..5c55694
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_user.h
@@ -0,0 +1 @@
+../../../upstream/include/my_user.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/my_xml.h b/libmysqlclient/mysql/mysql/my_xml.h
new file mode 120000
index 0000000..ac75fcb
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/my_xml.h
@@ -0,0 +1 @@
+../../../upstream/include/my_xml.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/myisam.h b/libmysqlclient/mysql/mysql/myisam.h
new file mode 120000
index 0000000..5a1126e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/myisam.h
@@ -0,0 +1 @@
+../../../upstream/include/myisam.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/myisammrg.h b/libmysqlclient/mysql/mysql/myisammrg.h
new file mode 120000
index 0000000..d27d91a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/myisammrg.h
@@ -0,0 +1 @@
+../../../upstream/include/myisammrg.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/myisampack.h b/libmysqlclient/mysql/mysql/myisampack.h
new file mode 120000
index 0000000..1a29219
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/myisampack.h
@@ -0,0 +1 @@
+../../../upstream/include/myisampack.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql.h b/libmysqlclient/mysql/mysql/mysql.h
new file mode 120000
index 0000000..ac5a1c8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql.h
@@ -0,0 +1 @@
+../../../upstream/include/mysql.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/.gitattributes b/libmysqlclient/mysql/mysql/mysql/.gitattributes
new file mode 100644
index 0000000..afcdcd5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/.gitattributes
@@ -0,0 +1 @@
+psi symlink=dir
diff --git a/libmysqlclient/mysql/mysql/mysql/client_authentication.h b/libmysqlclient/mysql/mysql/mysql/client_authentication.h
new file mode 120000
index 0000000..0e7ad9b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/client_authentication.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/client_authentication.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/client_plugin.h b/libmysqlclient/mysql/mysql/mysql/client_plugin.h
new file mode 120000
index 0000000..9e904b3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/client_plugin.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/client_plugin.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/com_data.h b/libmysqlclient/mysql/mysql/mysql/com_data.h
new file mode 120000
index 0000000..d68953c
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/com_data.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/com_data.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/component_implementation.h b/libmysqlclient/mysql/mysql/mysql/components/component_implementation.h
new file mode 120000
index 0000000..d158376
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/component_implementation.h
@@ -0,0 +1 @@
+../../../../../upstream/include/mysql/components/component_implementation.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/my_service.h b/libmysqlclient/mysql/mysql/mysql/components/my_service.h
new file mode 120000
index 0000000..fde8acb
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/my_service.h
@@ -0,0 +1 @@
+../../../../../upstream/include/mysql/components/my_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/service.h b/libmysqlclient/mysql/mysql/mysql/components/service.h
new file mode 120000
index 0000000..9723ff4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/service.h
@@ -0,0 +1 @@
+../../../../../upstream/include/mysql/components/service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/service_implementation.h b/libmysqlclient/mysql/mysql/mysql/components/service_implementation.h
new file mode 120000
index 0000000..0e5fcc7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/service_implementation.h
@@ -0,0 +1 @@
+../../../../../upstream/include/mysql/components/service_implementation.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/audit_api_message_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/audit_api_message_service.h
new file mode 120000
index 0000000..257aeb5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/audit_api_message_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/audit_api_message_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/backup_lock_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/backup_lock_service.h
new file mode 120000
index 0000000..af2df4d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/backup_lock_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/backup_lock_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/clone_protocol_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/clone_protocol_service.h
new file mode 120000
index 0000000..3b06158
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/clone_protocol_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/clone_protocol_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/component_status_var_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/component_status_var_service.h
new file mode 120000
index 0000000..30698f9
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/component_status_var_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/component_status_var_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/component_sys_var_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/component_sys_var_service.h
new file mode 120000
index 0000000..26b0f6f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/component_sys_var_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/component_sys_var_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader.h b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader.h
new file mode 120000
index 0000000..dc01279
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/dynamic_loader.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader_scheme_file.h b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader_scheme_file.h
new file mode 120000
index 0000000..753e7b0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader_scheme_file.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/dynamic_loader_scheme_file.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_privilege.h b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_privilege.h
new file mode 120000
index 0000000..d462e1b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/dynamic_privilege.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/dynamic_privilege.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/group_member_status_listener.h b/libmysqlclient/mysql/mysql/mysql/components/services/group_member_status_listener.h
new file mode 120000
index 0000000..e6b92f9
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/group_member_status_listener.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/group_member_status_listener.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/group_membership_listener.h b/libmysqlclient/mysql/mysql/mysql/components/services/group_membership_listener.h
new file mode 120000
index 0000000..f7b5967
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/group_membership_listener.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/group_membership_listener.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/host_application_signal.h b/libmysqlclient/mysql/mysql/mysql/components/services/host_application_signal.h
new file mode 120000
index 0000000..f358d8d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/host_application_signal.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/host_application_signal.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins.h b/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins.h
new file mode 120000
index 0000000..27e11b1
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/log_builtins.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins_filter.h b/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins_filter.h
new file mode 120000
index 0000000..6ca4680
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/log_builtins_filter.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/log_builtins_filter.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/log_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/log_service.h
new file mode 120000
index 0000000..b868698
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/log_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/log_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/log_shared.h b/libmysqlclient/mysql/mysql/mysql/components/services/log_shared.h
new file mode 120000
index 0000000..319c264
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/log_shared.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/log_shared.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/my_host_application_signal.h b/libmysqlclient/mysql/mysql/mysql/components/services/my_host_application_signal.h
new file mode 120000
index 0000000..61a3a7e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/my_host_application_signal.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/my_host_application_signal.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
new file mode 100644
index 0000000..270d859
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
@@ -0,0 +1,66 @@
+/* Copyright (c) 2016, 2017, 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, version 2.0,
+  as published by the Free Software Foundation.
+
+  This program is also distributed with certain software (including
+  but not limited to OpenSSL) that is licensed under separate terms,
+  as designated in a particular file or component or in included license
+  documentation.  The authors of MySQL hereby grant you an additional
+  permission to link the program and your derivative works with the
+  separately licensed software that they have included with MySQL.
+
+  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, version 2.0, 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 */
+
+#ifndef COMPONENTS_SERVICES_MY_IO_BITS_H
+#define COMPONENTS_SERVICES_MY_IO_BITS_H
+
+/**
+  @file mysql/components/services/my_io_bits.h
+  Types to make file and socket I/O compatible.
+*/
+
+#ifdef _WIN32
+/* Include common headers.*/
+#include <io.h> /* access(), chmod() */
+#ifdef WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <ws2tcpip.h> /* SOCKET */
+#endif
+#endif
+
+#ifndef MYSQL_ABI_CHECK
+#if !defined(_WIN32)
+#include <sys/socket.h>
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+#include <sys/types.h>  // Needed for mode_t, so IWYU pragma: keep.
+#endif
+
+typedef int File; /* File descriptor */
+#ifdef _WIN32
+#ifdef __MINGW32__
+typedef mode_t MY_MODE;
+#else
+typedef int MY_MODE;
+typedef int mode_t;
+#endif
+typedef int socket_len_t;
+typedef SOCKET my_socket;
+#else
+typedef mode_t MY_MODE;
+typedef socklen_t socket_len_t;
+typedef int my_socket; /* File descriptor for sockets */
+#endif /* _WIN32 */
+
+#endif /* COMPONENTS_SERVICES_MY_IO_BITS_H */
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h.orig b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h.orig
new file mode 120000
index 0000000..df817ee
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h.orig
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/my_io_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/my_thread_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/my_thread_bits.h
new file mode 120000
index 0000000..af13dcd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/my_thread_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/my_thread_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond.h
new file mode 120000
index 0000000..c551f9c
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_cond.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_bits.h
new file mode 120000
index 0000000..5ff98e0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_cond_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_service.h
new file mode 120000
index 0000000..160fdd8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_cond_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex.h
new file mode 120000
index 0000000..fbf3812
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_mutex.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_bits.h
new file mode 120000
index 0000000..d856b17
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_mutex_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_service.h
new file mode 120000
index 0000000..1b8f5a7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_mutex_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock.h
new file mode 120000
index 0000000..9ff2548
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_rwlock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_bits.h
new file mode 120000
index 0000000..526bc5b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_rwlock_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_service.h
new file mode 120000
index 0000000..336e6c1
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_rwlock_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_socket_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_socket_bits.h
new file mode 120000
index 0000000..2d3ec95
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_socket_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_socket_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/mysql_string.h b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_string.h
new file mode 120000
index 0000000..df8f075
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/mysql_string.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/mysql_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/ongoing_transaction_query_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/ongoing_transaction_query_service.h
new file mode 120000
index 0000000..93863ca
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/ongoing_transaction_query_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/ongoing_transaction_query_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/persistent_dynamic_loader.h b/libmysqlclient/mysql/mysql/mysql/components/services/persistent_dynamic_loader.h
new file mode 120000
index 0000000..18eb1ad
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/persistent_dynamic_loader.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/persistent_dynamic_loader.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/pfs_notification.h b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_notification.h
new file mode 120000
index 0000000..19388ac
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_notification.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/pfs_notification.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/pfs_plugin_table_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_plugin_table_service.h
new file mode 120000
index 0000000..26ad99c
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_plugin_table_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/pfs_plugin_table_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/pfs_resource_group.h b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_resource_group.h
new file mode 120000
index 0000000..ef72466
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/pfs_resource_group.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/pfs_resource_group.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond.h
new file mode 120000
index 0000000..290d009
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_cond.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_bits.h
new file mode 120000
index 0000000..a2d6769
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_cond_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_service.h
new file mode 120000
index 0000000..d8c3c65
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_cond_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_error.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error.h
new file mode 120000
index 0000000..dc0fdca
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_error.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_bits.h
new file mode 120000
index 0000000..580e8c3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_error_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_service.h
new file mode 120000
index 0000000..fc9e2bb
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_error_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_error_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_file.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file.h
new file mode 120000
index 0000000..c84a6f5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_file.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_bits.h
new file mode 120000
index 0000000..417b1ab
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_file_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_service.h
new file mode 120000
index 0000000..a231fe0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_file_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_file_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle.h
new file mode 120000
index 0000000..1e23697
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_idle.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_bits.h
new file mode 120000
index 0000000..28be2e8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_idle_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_service.h
new file mode 120000
index 0000000..a2cd9a0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_idle_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl.h
new file mode 120000
index 0000000..053567d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mdl.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_bits.h
new file mode 120000
index 0000000..a0b9d6e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mdl_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_service.h
new file mode 120000
index 0000000..52599e7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mdl_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory.h
new file mode 120000
index 0000000..85fe574
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_memory.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_bits.h
new file mode 120000
index 0000000..2c18480
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_memory_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_service.h
new file mode 120000
index 0000000..32a7aa6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_memory_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex.h
new file mode 120000
index 0000000..bd8cacf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mutex.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_bits.h
new file mode 120000
index 0000000..bca2d4b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mutex_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_service.h
new file mode 120000
index 0000000..fc2b201
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_mutex_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock.h
new file mode 120000
index 0000000..3cf0bfa
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_rwlock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_bits.h
new file mode 120000
index 0000000..06c66f3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_rwlock_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_service.h
new file mode 120000
index 0000000..97ff483
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_rwlock_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket.h
new file mode 120000
index 0000000..1680008
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_socket.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_bits.h
new file mode 120000
index 0000000..85a7c6b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_socket_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_service.h
new file mode 120000
index 0000000..a0724df
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_socket_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage.h
new file mode 120000
index 0000000..4479451
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_stage.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_bits.h
new file mode 120000
index 0000000..a88ee29
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_stage_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_service.h
new file mode 120000
index 0000000..90c8b0b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_stage_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement.h
new file mode 120000
index 0000000..9cfcf7e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_statement.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_bits.h
new file mode 120000
index 0000000..c22d623
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_statement_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_service.h
new file mode 120000
index 0000000..a41f65b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_statement_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_system.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system.h
new file mode 120000
index 0000000..0b1f33e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_system.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_bits.h
new file mode 120000
index 0000000..243c33e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_system_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_service.h
new file mode 120000
index 0000000..a38655e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_system_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_system_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_table.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table.h
new file mode 120000
index 0000000..98d2eda
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_table.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_bits.h
new file mode 120000
index 0000000..463b31e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_table_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_service.h
new file mode 120000
index 0000000..36b6cb3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_table_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_table_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread.h
new file mode 120000
index 0000000..78e7a93
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_thread.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_bits.h
new file mode 120000
index 0000000..1953510
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_thread_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_service.h
new file mode 120000
index 0000000..e0411ec
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_thread_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction.h
new file mode 120000
index 0000000..6387a33
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_transaction.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_bits.h
new file mode 120000
index 0000000..6b62678
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_transaction_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_service.h b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_service.h
new file mode 120000
index 0000000..a30317d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_service.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/psi_transaction_service.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/registry.h b/libmysqlclient/mysql/mysql/mysql/components/services/registry.h
new file mode 120000
index 0000000..ef5c526
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/registry.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/registry.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/security_context.h b/libmysqlclient/mysql/mysql/mysql/components/services/security_context.h
new file mode 120000
index 0000000..2ef3e1e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/security_context.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/security_context.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source.h b/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source.h
new file mode 120000
index 0000000..c181919
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/system_variable_source.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source_type.h b/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source_type.h
new file mode 120000
index 0000000..20957d9
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source_type.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/system_variable_source_type.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/thr_cond_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/thr_cond_bits.h
new file mode 120000
index 0000000..0340a78
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/thr_cond_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/thr_cond_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/thr_mutex_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/thr_mutex_bits.h
new file mode 120000
index 0000000..a9477a3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/thr_mutex_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/thr_mutex_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/thr_rwlock_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/thr_rwlock_bits.h
new file mode 120000
index 0000000..39afd49
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/thr_rwlock_bits.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/thr_rwlock_bits.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/udf_registration.h b/libmysqlclient/mysql/mysql/mysql/components/services/udf_registration.h
new file mode 120000
index 0000000..41b8e98
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/udf_registration.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/udf_registration.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/validate_password.h b/libmysqlclient/mysql/mysql/mysql/components/services/validate_password.h
new file mode 120000
index 0000000..e2d9e41
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/components/services/validate_password.h
@@ -0,0 +1 @@
+../../../../../../upstream/include/mysql/components/services/validate_password.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/get_password.h b/libmysqlclient/mysql/mysql/mysql/get_password.h
new file mode 120000
index 0000000..963f924
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/get_password.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/get_password.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/group_replication_priv.h b/libmysqlclient/mysql/mysql/mysql/group_replication_priv.h
new file mode 120000
index 0000000..7ac2921
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/group_replication_priv.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/group_replication_priv.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/innodb_priv.h b/libmysqlclient/mysql/mysql/mysql/innodb_priv.h
new file mode 120000
index 0000000..b7cc220
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/innodb_priv.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/innodb_priv.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/mysql_lex_string.h b/libmysqlclient/mysql/mysql/mysql/mysql_lex_string.h
new file mode 120000
index 0000000..c20ef1d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/mysql_lex_string.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/mysql_lex_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin.h b/libmysqlclient/mysql/mysql/mysql/plugin.h
new file mode 120000
index 0000000..ccd604f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_audit.h b/libmysqlclient/mysql/mysql/mysql/plugin_audit.h
new file mode 120000
index 0000000..a58c462
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_audit.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_audit.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_audit_message_types.h b/libmysqlclient/mysql/mysql/mysql/plugin_audit_message_types.h
new file mode 120000
index 0000000..f352cfc
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_audit_message_types.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_audit_message_types.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_auth.h b/libmysqlclient/mysql/mysql/mysql/plugin_auth.h
new file mode 120000
index 0000000..1d2c78a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_auth.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_auth.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_auth_common.h b/libmysqlclient/mysql/mysql/mysql/plugin_auth_common.h
new file mode 120000
index 0000000..9c6ae40
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_auth_common.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_auth_common.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_clone.h b/libmysqlclient/mysql/mysql/mysql/plugin_clone.h
new file mode 120000
index 0000000..be00252
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_clone.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_clone.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h b/libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h
new file mode 120000
index 0000000..3583299
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_ftparser.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_group_replication.h b/libmysqlclient/mysql/mysql/mysql/plugin_group_replication.h
new file mode 120000
index 0000000..b69c82d
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_group_replication.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_group_replication.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_keyring.h b/libmysqlclient/mysql/mysql/mysql/plugin_keyring.h
new file mode 120000
index 0000000..c5df6fa
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_keyring.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_keyring.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_query_rewrite.h b/libmysqlclient/mysql/mysql/mysql/plugin_query_rewrite.h
new file mode 120000
index 0000000..74dea20
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_query_rewrite.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_query_rewrite.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_trace.h b/libmysqlclient/mysql/mysql/mysql/plugin_trace.h
new file mode 120000
index 0000000..0d44e01
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_trace.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_trace.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/plugin_validate_password.h b/libmysqlclient/mysql/mysql/mysql/plugin_validate_password.h
new file mode 120000
index 0000000..2c8d42f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/plugin_validate_password.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/plugin_validate_password.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/psi b/libmysqlclient/mysql/mysql/mysql/psi
new file mode 120000
index 0000000..00521a1
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/psi
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/psi
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_command.h b/libmysqlclient/mysql/mysql/mysql/service_command.h
new file mode 120000
index 0000000..c7139e4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_command.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_command.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_locking.h b/libmysqlclient/mysql/mysql/mysql/service_locking.h
new file mode 120000
index 0000000..43e88f0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_locking.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_locking.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_my_plugin_log.h b/libmysqlclient/mysql/mysql/mysql/service_my_plugin_log.h
new file mode 120000
index 0000000..58eabb5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_my_plugin_log.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_my_plugin_log.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_mysql_alloc.h b/libmysqlclient/mysql/mysql/mysql/service_mysql_alloc.h
new file mode 120000
index 0000000..f1d234f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_mysql_alloc.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_mysql_alloc.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_mysql_keyring.h b/libmysqlclient/mysql/mysql/mysql/service_mysql_keyring.h
new file mode 120000
index 0000000..459f114
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_mysql_keyring.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_mysql_keyring.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_mysql_password_policy.h b/libmysqlclient/mysql/mysql/mysql/service_mysql_password_policy.h
new file mode 120000
index 0000000..6970b8e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_mysql_password_policy.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_mysql_password_policy.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_mysql_string.h b/libmysqlclient/mysql/mysql/mysql/service_mysql_string.h
new file mode 120000
index 0000000..cde8d34
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_mysql_string.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_mysql_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_parser.h b/libmysqlclient/mysql/mysql/mysql/service_parser.h
new file mode 120000
index 0000000..4a64f78
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_parser.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_parser.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_plugin_registry.h b/libmysqlclient/mysql/mysql/mysql/service_plugin_registry.h
new file mode 120000
index 0000000..34990b8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_plugin_registry.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_plugin_registry.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_ctx.h b/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_ctx.h
new file mode 120000
index 0000000..fb7325b
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_ctx.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_rpl_transaction_ctx.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_write_set.h b/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_write_set.h
new file mode 120000
index 0000000..3034983
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_write_set.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_rpl_transaction_write_set.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_rules_table.h b/libmysqlclient/mysql/mysql/mysql/service_rules_table.h
new file mode 120000
index 0000000..97788bd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_rules_table.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_rules_table.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_security_context.h b/libmysqlclient/mysql/mysql/mysql/service_security_context.h
new file mode 120000
index 0000000..9291fea
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_security_context.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_security_context.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_srv_session.h b/libmysqlclient/mysql/mysql/mysql/service_srv_session.h
new file mode 120000
index 0000000..f1c0a61
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_srv_session.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_srv_session.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_srv_session_info.h b/libmysqlclient/mysql/mysql/mysql/service_srv_session_info.h
new file mode 120000
index 0000000..915b3f8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_srv_session_info.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_srv_session_info.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_ssl_wrapper.h b/libmysqlclient/mysql/mysql/mysql/service_ssl_wrapper.h
new file mode 120000
index 0000000..c9703d5
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_ssl_wrapper.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_ssl_wrapper.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_thd_alloc.h b/libmysqlclient/mysql/mysql/mysql/service_thd_alloc.h
new file mode 120000
index 0000000..b7e6c2e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_thd_alloc.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_thd_alloc.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_thd_engine_lock.h b/libmysqlclient/mysql/mysql/mysql/service_thd_engine_lock.h
new file mode 120000
index 0000000..9ef11dc
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_thd_engine_lock.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_thd_engine_lock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_thd_wait.h b/libmysqlclient/mysql/mysql/mysql/service_thd_wait.h
new file mode 120000
index 0000000..9220f37
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_thd_wait.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_thd_wait.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/service_thread_scheduler.h b/libmysqlclient/mysql/mysql/mysql/service_thread_scheduler.h
new file mode 120000
index 0000000..6e86186
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/service_thread_scheduler.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/service_thread_scheduler.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/services.h b/libmysqlclient/mysql/mysql/mysql/services.h
new file mode 120000
index 0000000..4dec116
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/services.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/services.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/status_var.h b/libmysqlclient/mysql/mysql/mysql/status_var.h
new file mode 120000
index 0000000..24a0f97
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/status_var.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/status_var.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/thread_pool_priv.h b/libmysqlclient/mysql/mysql/mysql/thread_pool_priv.h
new file mode 120000
index 0000000..d34e51f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/thread_pool_priv.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/thread_pool_priv.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/thread_type.h b/libmysqlclient/mysql/mysql/mysql/thread_type.h
new file mode 120000
index 0000000..f1acfd8
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/thread_type.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/thread_type.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql/udf_registration_types.h b/libmysqlclient/mysql/mysql/mysql/udf_registration_types.h
new file mode 120000
index 0000000..3a12409
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql/udf_registration_types.h
@@ -0,0 +1 @@
+../../../../upstream/include/mysql/udf_registration_types.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql_com.h b/libmysqlclient/mysql/mysql/mysql_com.h
new file mode 120000
index 0000000..1760dbe
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql_com.h
@@ -0,0 +1 @@
+../../../upstream/include/mysql_com.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql_com_server.h b/libmysqlclient/mysql/mysql/mysql_com_server.h
new file mode 120000
index 0000000..5ec3443
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql_com_server.h
@@ -0,0 +1 @@
+../../../upstream/include/mysql_com_server.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysql_time.h b/libmysqlclient/mysql/mysql/mysql_time.h
new file mode 120000
index 0000000..165a3cd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysql_time.h
@@ -0,0 +1 @@
+../../../upstream/include/mysql_time.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/mysys_err.h b/libmysqlclient/mysql/mysql/mysys_err.h
new file mode 120000
index 0000000..8eefa67
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/mysys_err.h
@@ -0,0 +1 @@
+../../../upstream/include/mysys_err.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/nullable.h b/libmysqlclient/mysql/mysql/nullable.h
new file mode 120000
index 0000000..e4fc260
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/nullable.h
@@ -0,0 +1 @@
+../../../upstream/include/nullable.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/password.h b/libmysqlclient/mysql/mysql/password.h
new file mode 120000
index 0000000..d9e6b25
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/password.h
@@ -0,0 +1 @@
+../../../upstream/include/password.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_cond_provider.h b/libmysqlclient/mysql/mysql/pfs_cond_provider.h
new file mode 120000
index 0000000..cf4019a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_cond_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_cond_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_error_provider.h b/libmysqlclient/mysql/mysql/pfs_error_provider.h
new file mode 120000
index 0000000..92ec52a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_error_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_error_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_file_provider.h b/libmysqlclient/mysql/mysql/pfs_file_provider.h
new file mode 120000
index 0000000..a358562
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_file_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_file_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_idle_provider.h b/libmysqlclient/mysql/mysql/pfs_idle_provider.h
new file mode 120000
index 0000000..1f3a2a7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_idle_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_idle_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_memory_provider.h b/libmysqlclient/mysql/mysql/pfs_memory_provider.h
new file mode 120000
index 0000000..a2892cb
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_memory_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_memory_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_metadata_provider.h b/libmysqlclient/mysql/mysql/pfs_metadata_provider.h
new file mode 120000
index 0000000..ab13453
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_metadata_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_metadata_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_mutex_provider.h b/libmysqlclient/mysql/mysql/pfs_mutex_provider.h
new file mode 120000
index 0000000..e8cef7a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_mutex_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_mutex_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_rwlock_provider.h b/libmysqlclient/mysql/mysql/pfs_rwlock_provider.h
new file mode 120000
index 0000000..75c5d56
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_rwlock_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_rwlock_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_socket_provider.h b/libmysqlclient/mysql/mysql/pfs_socket_provider.h
new file mode 120000
index 0000000..45fe31c
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_socket_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_socket_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_stage_provider.h b/libmysqlclient/mysql/mysql/pfs_stage_provider.h
new file mode 120000
index 0000000..a3d9af4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_stage_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_stage_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_statement_provider.h b/libmysqlclient/mysql/mysql/pfs_statement_provider.h
new file mode 120000
index 0000000..cc01b1a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_statement_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_statement_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_system_provider.h b/libmysqlclient/mysql/mysql/pfs_system_provider.h
new file mode 120000
index 0000000..9077a3a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_system_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_system_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_table_provider.h b/libmysqlclient/mysql/mysql/pfs_table_provider.h
new file mode 120000
index 0000000..29c8492
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_table_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_table_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_thread_provider.h b/libmysqlclient/mysql/mysql/pfs_thread_provider.h
new file mode 120000
index 0000000..21be77f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_thread_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_thread_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/pfs_transaction_provider.h b/libmysqlclient/mysql/mysql/pfs_transaction_provider.h
new file mode 120000
index 0000000..abb4bf7
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/pfs_transaction_provider.h
@@ -0,0 +1 @@
+../../../upstream/include/pfs_transaction_provider.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/prealloced_array.h b/libmysqlclient/mysql/mysql/prealloced_array.h
new file mode 120000
index 0000000..1309a4f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/prealloced_array.h
@@ -0,0 +1 @@
+../../../upstream/include/prealloced_array.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/print_version.h b/libmysqlclient/mysql/mysql/print_version.h
new file mode 120000
index 0000000..c5583dd
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/print_version.h
@@ -0,0 +1 @@
+../../../upstream/include/print_version.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/priority_queue.h b/libmysqlclient/mysql/mysql/priority_queue.h
new file mode 120000
index 0000000..3b00ed9
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/priority_queue.h
@@ -0,0 +1 @@
+../../../upstream/include/priority_queue.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/rwlock_scoped_lock.h b/libmysqlclient/mysql/mysql/rwlock_scoped_lock.h
new file mode 120000
index 0000000..684a13a
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/rwlock_scoped_lock.h
@@ -0,0 +1 @@
+../../../upstream/include/rwlock_scoped_lock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/scope_guard.h b/libmysqlclient/mysql/mysql/scope_guard.h
new file mode 120000
index 0000000..cd62e4f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/scope_guard.h
@@ -0,0 +1 @@
+../../../upstream/include/scope_guard.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/service_versions.h b/libmysqlclient/mysql/mysql/service_versions.h
new file mode 120000
index 0000000..f418378
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/service_versions.h
@@ -0,0 +1 @@
+../../../upstream/include/service_versions.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sha1.h b/libmysqlclient/mysql/mysql/sha1.h
new file mode 120000
index 0000000..7584f6e
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sha1.h
@@ -0,0 +1 @@
+../../../upstream/include/sha1.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sha2.h b/libmysqlclient/mysql/mysql/sha2.h
new file mode 120000
index 0000000..9b57069
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sha2.h
@@ -0,0 +1 @@
+../../../upstream/include/sha2.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sql_chars.h b/libmysqlclient/mysql/mysql/sql_chars.h
new file mode 120000
index 0000000..97dfb0f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sql_chars.h
@@ -0,0 +1 @@
+../../../upstream/include/sql_chars.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sql_common.h b/libmysqlclient/mysql/mysql/sql_common.h
new file mode 120000
index 0000000..b217d51
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sql_common.h
@@ -0,0 +1 @@
+../../../upstream/include/sql_common.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sql_string.h b/libmysqlclient/mysql/mysql/sql_string.h
new file mode 120000
index 0000000..687e3cf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sql_string.h
@@ -0,0 +1 @@
+../../../upstream/include/sql_string.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sslopt-case.h b/libmysqlclient/mysql/mysql/sslopt-case.h
new file mode 120000
index 0000000..d4198b2
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sslopt-case.h
@@ -0,0 +1 @@
+../../../upstream/include/sslopt-case.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sslopt-longopts.h b/libmysqlclient/mysql/mysql/sslopt-longopts.h
new file mode 120000
index 0000000..8d84baf
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sslopt-longopts.h
@@ -0,0 +1 @@
+../../../upstream/include/sslopt-longopts.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/sslopt-vars.h b/libmysqlclient/mysql/mysql/sslopt-vars.h
new file mode 120000
index 0000000..9ec7fcc
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/sslopt-vars.h
@@ -0,0 +1 @@
+../../../upstream/include/sslopt-vars.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/template_utils.h b/libmysqlclient/mysql/mysql/template_utils.h
new file mode 120000
index 0000000..3a56cde
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/template_utils.h
@@ -0,0 +1 @@
+../../../upstream/include/template_utils.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/thr_cond.h b/libmysqlclient/mysql/mysql/thr_cond.h
new file mode 120000
index 0000000..581abc6
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/thr_cond.h
@@ -0,0 +1 @@
+../../../upstream/include/thr_cond.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/thr_lock.h b/libmysqlclient/mysql/mysql/thr_lock.h
new file mode 120000
index 0000000..70abec0
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/thr_lock.h
@@ -0,0 +1 @@
+../../../upstream/include/thr_lock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/thr_mutex.h b/libmysqlclient/mysql/mysql/thr_mutex.h
new file mode 120000
index 0000000..2223c04
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/thr_mutex.h
@@ -0,0 +1 @@
+../../../upstream/include/thr_mutex.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/thr_rwlock.h b/libmysqlclient/mysql/mysql/thr_rwlock.h
new file mode 120000
index 0000000..4ade91f
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/thr_rwlock.h
@@ -0,0 +1 @@
+../../../upstream/include/thr_rwlock.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/typelib.h b/libmysqlclient/mysql/mysql/typelib.h
new file mode 120000
index 0000000..f718e86
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/typelib.h
@@ -0,0 +1 @@
+../../../upstream/include/typelib.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/unsafe_string_append.h b/libmysqlclient/mysql/mysql/unsafe_string_append.h
new file mode 120000
index 0000000..72449fb
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/unsafe_string_append.h
@@ -0,0 +1 @@
+../../../upstream/include/unsafe_string_append.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/varlen_sort.h b/libmysqlclient/mysql/mysql/varlen_sort.h
new file mode 120000
index 0000000..71f69e4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/varlen_sort.h
@@ -0,0 +1 @@
+../../../upstream/include/varlen_sort.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/violite.h b/libmysqlclient/mysql/mysql/violite.h
new file mode 120000
index 0000000..f7776d3
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/violite.h
@@ -0,0 +1 @@
+../../../upstream/include/violite.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/welcome_copyright_notice.h b/libmysqlclient/mysql/mysql/welcome_copyright_notice.h
new file mode 120000
index 0000000..26230b4
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/welcome_copyright_notice.h
@@ -0,0 +1 @@
+../../../upstream/include/welcome_copyright_notice.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution.h b/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution.h
new file mode 120000
index 0000000..83fc5f2
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution.h
@@ -0,0 +1 @@
+../../../upstream/include/wolfssl_fix_namespace_pollution.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution_pre.h b/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution_pre.h
new file mode 120000
index 0000000..05a2c65
--- /dev/null
+++ b/libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution_pre.h
@@ -0,0 +1 @@
+../../../upstream/include/wolfssl_fix_namespace_pollution_pre.h
\ No newline at end of file
-- 
cgit v1.1