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/README-DEV                          |  42 +-
 libmysqlclient/manifest                            |   5 +-
 libmysqlclient/mingw.patch                         |  94 +++
 libmysqlclient/mysql/.gitattributes                |   2 -
 libmysqlclient/mysql/buildfile                     |   4 +-
 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 +
 libmysqlclient/mysql/mysys                         |   1 -
 libmysqlclient/mysql/mysys/array.cc                |   1 +
 libmysqlclient/mysql/mysys/base64.cc               |   1 +
 libmysqlclient/mysql/mysys/charset-def.cc          |   1 +
 libmysqlclient/mysql/mysys/charset.cc              |   1 +
 libmysqlclient/mysql/mysys/checksum.cc             |   1 +
 libmysqlclient/mysql/mysys/errors.cc               |   1 +
 libmysqlclient/mysql/mysys/kqueue_timers.cc        |   1 +
 libmysqlclient/mysql/mysys/lf_alloc-pin.cc         |   1 +
 libmysqlclient/mysql/mysys/lf_dynarray.cc          |   1 +
 libmysqlclient/mysql/mysys/lf_hash.cc              |   1 +
 libmysqlclient/mysql/mysys/list.cc                 |   1 +
 libmysqlclient/mysql/mysys/mf_arr_appstr.cc        |   1 +
 libmysqlclient/mysql/mysys/mf_cache.cc             |   1 +
 libmysqlclient/mysql/mysys/mf_dirname.cc           |   1 +
 libmysqlclient/mysql/mysys/mf_fn_ext.cc            |   1 +
 libmysqlclient/mysql/mysys/mf_format.cc            |   1 +
 libmysqlclient/mysql/mysys/mf_getdate.cc           |   1 +
 libmysqlclient/mysql/mysys/mf_iocache.cc           |   1 +
 libmysqlclient/mysql/mysys/mf_iocache2.cc          |   1 +
 libmysqlclient/mysql/mysys/mf_keycache.cc          |   1 +
 libmysqlclient/mysql/mysys/mf_keycaches.cc         |   1 +
 libmysqlclient/mysql/mysys/mf_loadpath.cc          |   1 +
 libmysqlclient/mysql/mysys/mf_pack.cc              |   1 +
 libmysqlclient/mysql/mysys/mf_path.cc              |   1 +
 libmysqlclient/mysql/mysys/mf_qsort2.cc            |   1 +
 libmysqlclient/mysql/mysys/mf_same.cc              |   1 +
 libmysqlclient/mysql/mysys/mf_tempdir.cc           |   1 +
 libmysqlclient/mysql/mysys/mf_tempfile.cc          |   1 +
 libmysqlclient/mysql/mysys/mf_unixpath.cc          |   1 +
 libmysqlclient/mysql/mysys/mf_wcomp.cc             |   1 +
 libmysqlclient/mysql/mysys/mulalloc.cc             |   1 +
 libmysqlclient/mysql/mysys/my_access.cc            |   1 +
 libmysqlclient/mysql/mysys/my_alloc.cc             |   1 +
 libmysqlclient/mysql/mysys/my_bit.cc               |   1 +
 libmysqlclient/mysql/mysys/my_bitmap.cc            |   1 +
 libmysqlclient/mysql/mysys/my_chmod.cc             |   1 +
 libmysqlclient/mysql/mysys/my_chsize.cc            |   1 +
 libmysqlclient/mysql/mysys/my_compare.cc           |   1 +
 libmysqlclient/mysql/mysys/my_compress.cc          |   1 +
 libmysqlclient/mysql/mysys/my_conio.cc             |   1 +
 libmysqlclient/mysql/mysys/my_copy.cc              |   1 +
 libmysqlclient/mysql/mysys/my_create.cc            |   1 +
 libmysqlclient/mysql/mysys/my_delete.cc            |   1 +
 libmysqlclient/mysql/mysys/my_div.cc               |   1 +
 libmysqlclient/mysql/mysys/my_error.cc             |   1 +
 libmysqlclient/mysql/mysys/my_fallocator.cc        |   1 +
 libmysqlclient/mysql/mysys/my_file.cc              |   1 +
 libmysqlclient/mysql/mysys/my_fopen.cc             |   1 +
 libmysqlclient/mysql/mysys/my_fstream.cc           |   1 +
 libmysqlclient/mysql/mysys/my_gethwaddr.cc         |   1 +
 libmysqlclient/mysql/mysys/my_getsystime.cc        |   1 +
 libmysqlclient/mysql/mysys/my_getwd.cc             |   1 +
 libmysqlclient/mysql/mysys/my_handler_errors.h     |   1 +
 libmysqlclient/mysql/mysys/my_init.cc              |   1 +
 libmysqlclient/mysql/mysys/my_largepage.cc         |   1 +
 libmysqlclient/mysql/mysys/my_lib.cc               |   1 +
 libmysqlclient/mysql/mysys/my_malloc.cc            |   1 +
 libmysqlclient/mysql/mysys/my_mess.cc              |   1 +
 libmysqlclient/mysql/mysys/my_mkdir.cc             |   1 +
 libmysqlclient/mysql/mysys/my_mmap.cc              |   1 +
 libmysqlclient/mysql/mysys/my_murmur3.cc           |   1 +
 libmysqlclient/mysql/mysys/my_once.cc              |   1 +
 libmysqlclient/mysql/mysys/my_open.cc              |   1 +
 libmysqlclient/mysql/mysys/my_pread.cc             |   1 +
 libmysqlclient/mysql/mysys/my_rdtsc.cc             |   1 +
 libmysqlclient/mysql/mysys/my_read.cc              |   1 +
 libmysqlclient/mysql/mysys/my_rename.cc            |   1 +
 libmysqlclient/mysql/mysys/my_seek.cc              |   1 +
 libmysqlclient/mysql/mysys/my_static.cc            |   1 +
 libmysqlclient/mysql/mysys/my_static.h             |   1 +
 libmysqlclient/mysql/mysys/my_string.cc            |   1 +
 libmysqlclient/mysql/mysys/my_symlink.cc           |   1 +
 libmysqlclient/mysql/mysys/my_symlink2.cc          |   1 +
 libmysqlclient/mysql/mysys/my_sync.cc              |   1 +
 libmysqlclient/mysql/mysys/my_syslog.cc            |   1 +
 libmysqlclient/mysql/mysys/my_thr_init.cc          | 385 ++++++++++
 libmysqlclient/mysql/mysys/my_thr_init.cc.orig     |   1 +
 libmysqlclient/mysql/mysys/my_thread.cc            |   1 +
 libmysqlclient/mysql/mysys/my_time.cc              |   1 +
 libmysqlclient/mysql/mysys/my_timespec.cc          |   1 +
 libmysqlclient/mysql/mysys/my_user.cc              |   1 +
 libmysqlclient/mysql/mysys/my_windac.cc            |   1 +
 libmysqlclient/mysql/mysys/my_winerr.cc            |   1 +
 libmysqlclient/mysql/mysys/my_winfile.cc           |   1 +
 libmysqlclient/mysql/mysys/my_write.cc             |   1 +
 libmysqlclient/mysql/mysys/mysys_priv.h            |   1 +
 libmysqlclient/mysql/mysys/pack.cc                 |   1 +
 libmysqlclient/mysql/mysys/posix_timers.cc         |   1 +
 libmysqlclient/mysql/mysys/print_version.cc        |   1 +
 libmysqlclient/mysql/mysys/psi_noop.cc             |   1 +
 libmysqlclient/mysql/mysys/ptr_cmp.cc              |   1 +
 libmysqlclient/mysql/mysys/sql_chars.cc            |   1 +
 libmysqlclient/mysql/mysys/stacktrace.cc           | 784 +++++++++++++++++++++
 libmysqlclient/mysql/mysys/stacktrace.cc.orig      |   1 +
 libmysqlclient/mysql/mysys/thr_cond.cc             |   1 +
 libmysqlclient/mysql/mysys/thr_lock.cc             |   1 +
 libmysqlclient/mysql/mysys/thr_mutex.cc            |   1 +
 libmysqlclient/mysql/mysys/thr_rwlock.cc           |   1 +
 libmysqlclient/mysql/mysys/tree.cc                 |   1 +
 libmysqlclient/mysql/mysys/typelib.cc              |   1 +
 libmysqlclient/mysql/mysys/win_timers.cc           |   1 +
 libmysqlclient/mysql/version.h.in                  |   2 +-
 372 files changed, 2567 insertions(+), 13 deletions(-)
 create mode 100644 libmysqlclient/mingw.patch
 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
 delete mode 120000 libmysqlclient/mysql/mysys
 create mode 120000 libmysqlclient/mysql/mysys/array.cc
 create mode 120000 libmysqlclient/mysql/mysys/base64.cc
 create mode 120000 libmysqlclient/mysql/mysys/charset-def.cc
 create mode 120000 libmysqlclient/mysql/mysys/charset.cc
 create mode 120000 libmysqlclient/mysql/mysys/checksum.cc
 create mode 120000 libmysqlclient/mysql/mysys/errors.cc
 create mode 120000 libmysqlclient/mysql/mysys/kqueue_timers.cc
 create mode 120000 libmysqlclient/mysql/mysys/lf_alloc-pin.cc
 create mode 120000 libmysqlclient/mysql/mysys/lf_dynarray.cc
 create mode 120000 libmysqlclient/mysql/mysys/lf_hash.cc
 create mode 120000 libmysqlclient/mysql/mysys/list.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_arr_appstr.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_cache.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_dirname.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_fn_ext.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_format.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_getdate.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_iocache.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_iocache2.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_keycache.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_keycaches.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_loadpath.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_pack.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_path.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_qsort2.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_same.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_tempdir.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_tempfile.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_unixpath.cc
 create mode 120000 libmysqlclient/mysql/mysys/mf_wcomp.cc
 create mode 120000 libmysqlclient/mysql/mysys/mulalloc.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_access.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_alloc.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_bit.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_bitmap.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_chmod.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_chsize.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_compare.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_compress.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_conio.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_copy.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_create.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_delete.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_div.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_error.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_fallocator.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_file.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_fopen.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_fstream.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_gethwaddr.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_getsystime.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_getwd.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_handler_errors.h
 create mode 120000 libmysqlclient/mysql/mysys/my_init.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_largepage.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_lib.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_malloc.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_mess.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_mkdir.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_mmap.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_murmur3.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_once.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_open.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_pread.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_rdtsc.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_read.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_rename.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_seek.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_static.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_static.h
 create mode 120000 libmysqlclient/mysql/mysys/my_string.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_symlink.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_symlink2.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_sync.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_syslog.cc
 create mode 100644 libmysqlclient/mysql/mysys/my_thr_init.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_thr_init.cc.orig
 create mode 120000 libmysqlclient/mysql/mysys/my_thread.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_time.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_timespec.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_user.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_windac.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_winerr.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_winfile.cc
 create mode 120000 libmysqlclient/mysql/mysys/my_write.cc
 create mode 120000 libmysqlclient/mysql/mysys/mysys_priv.h
 create mode 120000 libmysqlclient/mysql/mysys/pack.cc
 create mode 120000 libmysqlclient/mysql/mysys/posix_timers.cc
 create mode 120000 libmysqlclient/mysql/mysys/print_version.cc
 create mode 120000 libmysqlclient/mysql/mysys/psi_noop.cc
 create mode 120000 libmysqlclient/mysql/mysys/ptr_cmp.cc
 create mode 120000 libmysqlclient/mysql/mysys/sql_chars.cc
 create mode 100644 libmysqlclient/mysql/mysys/stacktrace.cc
 create mode 120000 libmysqlclient/mysql/mysys/stacktrace.cc.orig
 create mode 120000 libmysqlclient/mysql/mysys/thr_cond.cc
 create mode 120000 libmysqlclient/mysql/mysys/thr_lock.cc
 create mode 120000 libmysqlclient/mysql/mysys/thr_mutex.cc
 create mode 120000 libmysqlclient/mysql/mysys/thr_rwlock.cc
 create mode 120000 libmysqlclient/mysql/mysys/tree.cc
 create mode 120000 libmysqlclient/mysql/mysys/typelib.cc
 create mode 120000 libmysqlclient/mysql/mysys/win_timers.cc

(limited to 'libmysqlclient')

diff --git a/libmysqlclient/README-DEV b/libmysqlclient/README-DEV
index b69995c..e619bc5 100644
--- a/libmysqlclient/README-DEV
+++ b/libmysqlclient/README-DEV
@@ -6,9 +6,45 @@ Symlink the required upstream components and provide our own implementations
 for auto-generated headers:
 
 $ ln -s ../upstream/LICENSE
-$ ln -s ../../upstream/{vio,sql,mysys,mysys_ssl,libbinlogevents,libmysql} mysql
-$ ln -s ../../upstream/include mysql/mysql
-$ ln -s mysql/mysql_version.h.in mysql/version.h.in
+#$ ln -s ../../upstream/{vio,sql,mysys,mysys_ssl,libbinlogevents,libmysql} mysql
+$ ln -s ../../upstream/{vio,sql,mysys_ssl,libbinlogevents,libmysql} mysql
+#$ ln -s ../../upstream/include mysql/mysql
+$ ln -s ../../upstream/include/mysql_version.h.in mysql/version.h.in
+
+Add support for building with MinGW GCC:
+
+$ mkdir -p mysql/mysql
+$ pushd mysql/mysql
+$ ln -s ../../../upstream/include/*.h .
+$ mv m_ctype.h m_ctype.h.orig
+$ cp m_ctype.h.orig m_ctype.h
+$ mv my_dir.h my_dir.h.orig
+$ cp my_dir.h.orig my_dir.h
+$ mkdir -p mysql/components/services
+$ cd mysql/components/services
+$ ln -s ../../../../../../upstream/include/mysql/components/services/*.h .
+$ mv my_io_bits.h my_io_bits.h.orig
+$ cp my_io_bits.h.orig my_io_bits.h
+$ cd ..
+$ ln -s ../../../../../upstream/include/mysql/components/*.h .
+$ cd ..
+$ ln -s ../../../../upstream/include/mysql/psi .
+$ ln -s ../../../../upstream/include/mysql/*.h .
+$ popd
+$ mkdir -p mysql/mysys
+$ pushd mysql/mysys
+$ ln -s ../../../upstream/mysys/*.{h,cc} .
+$ mv my_thr_init.cc my_thr_init.cc.orig
+$ cp my_thr_init.cc.orig my_thr_init.cc
+$ mv stacktrace.cc stacktrace.cc.orig
+$ cp stacktrace.cc.orig stacktrace.cc
+$ popd
+
+$ git apply mingw.patch
+
+Note that the above patches are produced by the following commands:
+
+$ git diff ><patch-path>
 
 Also make sure all source files are UTF-8-encoded:
 
diff --git a/libmysqlclient/manifest b/libmysqlclient/manifest
index e3ed48f..18db38c 100644
--- a/libmysqlclient/manifest
+++ b/libmysqlclient/manifest
@@ -3,7 +3,7 @@ name: libmysqlclient
 
 # Note: remember to update doc-url below!
 #
-version: 8.0.15+15
+version: 8.0.15+16
 
 project: mysql
 summary: MySQL C API client library
@@ -19,8 +19,7 @@ package-email: packaging@build2.org ; Mailing list.
 build-error-email: builds@build2.org
 builds: all
 builds: -wasm
-builds: -( +windows &gcc ) ; MinGW GCC is not supported.
-builds: -static            ; Implementation uses C++ and requires special linking steps.
+builds: -static ; Implementation uses C++ and requires special linking steps.
 depends: * build2 >= 0.15.0
 depends: * bpkg >= 0.15.0
 depends: libz ^1.2.1100
diff --git a/libmysqlclient/mingw.patch b/libmysqlclient/mingw.patch
new file mode 100644
index 0000000..5b72872
--- /dev/null
+++ b/libmysqlclient/mingw.patch
@@ -0,0 +1,94 @@
+diff --git a/libmysqlclient/mysql/mysql/m_ctype.h b/libmysqlclient/mysql/mysql/m_ctype.h
+index d59bb12..a0afe7a 100644
+--- a/libmysqlclient/mysql/mysql/m_ctype.h
++++ b/libmysqlclient/mysql/mysql/m_ctype.h
+@@ -235,7 +235,7 @@ typedef struct MY_COLLATION_HANDLER {
+                  const char *wildstr, const char *wildend, int escape,
+                  int w_one, int w_many);
+ 
+-  int (*strcasecmp)(const CHARSET_INFO *, const char *, const char *);
++  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,
+@@ -681,7 +681,7 @@ values < 0x7F. */
+   ((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_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))
+ 
+diff --git a/libmysqlclient/mysql/mysql/my_dir.h b/libmysqlclient/mysql/mysql/my_dir.h
+index c179ad8..c4656b7 100644
+--- a/libmysqlclient/mysql/mysql/my_dir.h
++++ b/libmysqlclient/mysql/mysql/my_dir.h
+@@ -36,9 +36,11 @@
+ /* 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 */
+diff --git a/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
+index f561189..270d859 100644
+--- a/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
++++ b/libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h
+@@ -49,8 +49,12 @@
+ 
+ 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
+diff --git a/libmysqlclient/mysql/mysys/my_thr_init.cc b/libmysqlclient/mysql/mysys/my_thr_init.cc
+index b041de3..ba10464 100644
+--- a/libmysqlclient/mysql/mysys/my_thr_init.cc
++++ b/libmysqlclient/mysql/mysys/my_thr_init.cc
+@@ -373,7 +373,13 @@ static void my_sigabrt_handler(int sig) { __debugbreak(); }
+ 
+ static void install_sigabrt_handler() {
+   /*abort() should not override our exception filter*/
++
++  // Requires msvcrt90 or later but forcing this in a library is
++  // probably not a good idea.
++  //
++#ifndef __MINGW32__
+   _set_abort_behavior(0, _CALL_REPORTFAULT);
++#endif
+   signal(SIGABRT, my_sigabrt_handler);
+ }
+ #endif
+diff --git a/libmysqlclient/mysql/mysys/stacktrace.cc b/libmysqlclient/mysql/mysys/stacktrace.cc
+index c941bf7..9f7e443 100644
+--- a/libmysqlclient/mysql/mysys/stacktrace.cc
++++ b/libmysqlclient/mysql/mysys/stacktrace.cc
+@@ -536,12 +536,16 @@ void my_create_minidump(const char *name, HANDLE process, DWORD pid) {
+ }
+ 
+ void my_safe_puts_stderr(const char *val, size_t len) {
++#ifndef __MINGW32__
+   __try {
++#endif
+     my_write_stderr(val, len);
+     my_safe_printf_stderr("%s", "\n");
++#ifndef __MINGW32__
+   } __except (EXCEPTION_EXECUTE_HANDLER) {
+     my_safe_printf_stderr("%s", "is an invalid string pointer\n");
+   }
++#endif
+ }
+ #endif /* _WIN32 */
+ 
diff --git a/libmysqlclient/mysql/.gitattributes b/libmysqlclient/mysql/.gitattributes
index 0cfb4b7..e728b61 100644
--- a/libmysqlclient/mysql/.gitattributes
+++ b/libmysqlclient/mysql/.gitattributes
@@ -1,7 +1,5 @@
 libbinlogevents symlink=dir
 libmysql        symlink=dir
-mysql           symlink=dir
-mysys           symlink=dir
 mysys_ssl       symlink=dir
 sql             symlink=dir
 vio             symlink=dir
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile
index 37a627a..d9273bf 100644
--- a/libmysqlclient/mysql/buildfile
+++ b/libmysqlclient/mysql/buildfile
@@ -216,10 +216,10 @@ switch $c.class
 switch $tclass, $tsys
 {
   case 'windows', 'mingw32'
-    cc.libs += -ladvapi32
+    cc.libs += -lws2_32 -ldbghelp -lsecur32 -ladvapi32
 
   case 'windows'
-    cc.libs += advapi32.lib
+    cc.libs += advapi32.lib # Note: rest linked via pragmas.
 
   case 'linux'
   {
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
diff --git a/libmysqlclient/mysql/mysys b/libmysqlclient/mysql/mysys
deleted file mode 120000
index 0708a61..0000000
--- a/libmysqlclient/mysql/mysys
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/mysys
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/array.cc b/libmysqlclient/mysql/mysys/array.cc
new file mode 120000
index 0000000..66dae1a
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/array.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/array.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/base64.cc b/libmysqlclient/mysql/mysys/base64.cc
new file mode 120000
index 0000000..7739086
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/base64.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/base64.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/charset-def.cc b/libmysqlclient/mysql/mysys/charset-def.cc
new file mode 120000
index 0000000..2453db1
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/charset-def.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/charset-def.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/charset.cc b/libmysqlclient/mysql/mysys/charset.cc
new file mode 120000
index 0000000..30b6c18
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/charset.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/charset.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/checksum.cc b/libmysqlclient/mysql/mysys/checksum.cc
new file mode 120000
index 0000000..fc46b72
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/checksum.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/checksum.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/errors.cc b/libmysqlclient/mysql/mysys/errors.cc
new file mode 120000
index 0000000..e3cdef4
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/errors.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/errors.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/kqueue_timers.cc b/libmysqlclient/mysql/mysys/kqueue_timers.cc
new file mode 120000
index 0000000..0555fd5
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/kqueue_timers.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/kqueue_timers.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/lf_alloc-pin.cc b/libmysqlclient/mysql/mysys/lf_alloc-pin.cc
new file mode 120000
index 0000000..942e564
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/lf_alloc-pin.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/lf_alloc-pin.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/lf_dynarray.cc b/libmysqlclient/mysql/mysys/lf_dynarray.cc
new file mode 120000
index 0000000..f8e6648
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/lf_dynarray.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/lf_dynarray.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/lf_hash.cc b/libmysqlclient/mysql/mysys/lf_hash.cc
new file mode 120000
index 0000000..f85fe22
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/lf_hash.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/lf_hash.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/list.cc b/libmysqlclient/mysql/mysys/list.cc
new file mode 120000
index 0000000..e20e210
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/list.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/list.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_arr_appstr.cc b/libmysqlclient/mysql/mysys/mf_arr_appstr.cc
new file mode 120000
index 0000000..7e9305c
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_arr_appstr.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_arr_appstr.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_cache.cc b/libmysqlclient/mysql/mysys/mf_cache.cc
new file mode 120000
index 0000000..e652859
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_cache.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_cache.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_dirname.cc b/libmysqlclient/mysql/mysys/mf_dirname.cc
new file mode 120000
index 0000000..4cf0ca1
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_dirname.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_dirname.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_fn_ext.cc b/libmysqlclient/mysql/mysys/mf_fn_ext.cc
new file mode 120000
index 0000000..586cca6
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_fn_ext.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_fn_ext.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_format.cc b/libmysqlclient/mysql/mysys/mf_format.cc
new file mode 120000
index 0000000..6319f27
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_format.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_format.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_getdate.cc b/libmysqlclient/mysql/mysys/mf_getdate.cc
new file mode 120000
index 0000000..f888517
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_getdate.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_getdate.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_iocache.cc b/libmysqlclient/mysql/mysys/mf_iocache.cc
new file mode 120000
index 0000000..e646b51
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_iocache.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_iocache.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_iocache2.cc b/libmysqlclient/mysql/mysys/mf_iocache2.cc
new file mode 120000
index 0000000..d6d484c
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_iocache2.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_iocache2.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_keycache.cc b/libmysqlclient/mysql/mysys/mf_keycache.cc
new file mode 120000
index 0000000..d34b375
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_keycache.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_keycache.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_keycaches.cc b/libmysqlclient/mysql/mysys/mf_keycaches.cc
new file mode 120000
index 0000000..9253369
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_keycaches.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_keycaches.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_loadpath.cc b/libmysqlclient/mysql/mysys/mf_loadpath.cc
new file mode 120000
index 0000000..65ecde0
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_loadpath.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_loadpath.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_pack.cc b/libmysqlclient/mysql/mysys/mf_pack.cc
new file mode 120000
index 0000000..a4914b4
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_pack.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_pack.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_path.cc b/libmysqlclient/mysql/mysys/mf_path.cc
new file mode 120000
index 0000000..82cef95
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_path.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_path.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_qsort2.cc b/libmysqlclient/mysql/mysys/mf_qsort2.cc
new file mode 120000
index 0000000..4ecab6c
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_qsort2.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_qsort2.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_same.cc b/libmysqlclient/mysql/mysys/mf_same.cc
new file mode 120000
index 0000000..075cb12
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_same.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_same.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_tempdir.cc b/libmysqlclient/mysql/mysys/mf_tempdir.cc
new file mode 120000
index 0000000..2a3b0e7
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_tempdir.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_tempdir.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_tempfile.cc b/libmysqlclient/mysql/mysys/mf_tempfile.cc
new file mode 120000
index 0000000..482324e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_tempfile.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_tempfile.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_unixpath.cc b/libmysqlclient/mysql/mysys/mf_unixpath.cc
new file mode 120000
index 0000000..f35a903
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_unixpath.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_unixpath.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mf_wcomp.cc b/libmysqlclient/mysql/mysys/mf_wcomp.cc
new file mode 120000
index 0000000..02c2d72
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mf_wcomp.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mf_wcomp.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mulalloc.cc b/libmysqlclient/mysql/mysys/mulalloc.cc
new file mode 120000
index 0000000..5afce3e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mulalloc.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/mulalloc.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_access.cc b/libmysqlclient/mysql/mysys/my_access.cc
new file mode 120000
index 0000000..3c85276
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_access.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_access.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_alloc.cc b/libmysqlclient/mysql/mysys/my_alloc.cc
new file mode 120000
index 0000000..84e36f2
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_alloc.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_alloc.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_bit.cc b/libmysqlclient/mysql/mysys/my_bit.cc
new file mode 120000
index 0000000..050f0bd
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_bit.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_bit.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_bitmap.cc b/libmysqlclient/mysql/mysys/my_bitmap.cc
new file mode 120000
index 0000000..8b532bb
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_bitmap.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_bitmap.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_chmod.cc b/libmysqlclient/mysql/mysys/my_chmod.cc
new file mode 120000
index 0000000..471133f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_chmod.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_chmod.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_chsize.cc b/libmysqlclient/mysql/mysys/my_chsize.cc
new file mode 120000
index 0000000..fbe7745
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_chsize.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_chsize.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_compare.cc b/libmysqlclient/mysql/mysys/my_compare.cc
new file mode 120000
index 0000000..19cc566
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_compare.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_compare.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_compress.cc b/libmysqlclient/mysql/mysys/my_compress.cc
new file mode 120000
index 0000000..4ff176e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_compress.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_compress.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_conio.cc b/libmysqlclient/mysql/mysys/my_conio.cc
new file mode 120000
index 0000000..844aa26
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_conio.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_conio.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_copy.cc b/libmysqlclient/mysql/mysys/my_copy.cc
new file mode 120000
index 0000000..bc44370
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_copy.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_copy.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_create.cc b/libmysqlclient/mysql/mysys/my_create.cc
new file mode 120000
index 0000000..b45c076
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_create.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_create.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_delete.cc b/libmysqlclient/mysql/mysys/my_delete.cc
new file mode 120000
index 0000000..1bf38e6
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_delete.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_delete.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_div.cc b/libmysqlclient/mysql/mysys/my_div.cc
new file mode 120000
index 0000000..2dbc3e8
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_div.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_div.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_error.cc b/libmysqlclient/mysql/mysys/my_error.cc
new file mode 120000
index 0000000..9ebc574
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_error.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_error.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_fallocator.cc b/libmysqlclient/mysql/mysys/my_fallocator.cc
new file mode 120000
index 0000000..a86827f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_fallocator.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_fallocator.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_file.cc b/libmysqlclient/mysql/mysys/my_file.cc
new file mode 120000
index 0000000..bbaff4a
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_file.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_file.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_fopen.cc b/libmysqlclient/mysql/mysys/my_fopen.cc
new file mode 120000
index 0000000..229ba82
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_fopen.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_fopen.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_fstream.cc b/libmysqlclient/mysql/mysys/my_fstream.cc
new file mode 120000
index 0000000..b269697
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_fstream.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_fstream.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_gethwaddr.cc b/libmysqlclient/mysql/mysys/my_gethwaddr.cc
new file mode 120000
index 0000000..55763d9
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_gethwaddr.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_gethwaddr.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_getsystime.cc b/libmysqlclient/mysql/mysys/my_getsystime.cc
new file mode 120000
index 0000000..048ed3f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_getsystime.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_getsystime.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_getwd.cc b/libmysqlclient/mysql/mysys/my_getwd.cc
new file mode 120000
index 0000000..b4e01f0
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_getwd.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_getwd.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_handler_errors.h b/libmysqlclient/mysql/mysys/my_handler_errors.h
new file mode 120000
index 0000000..23b1037
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_handler_errors.h
@@ -0,0 +1 @@
+../../../upstream/mysys/my_handler_errors.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_init.cc b/libmysqlclient/mysql/mysys/my_init.cc
new file mode 120000
index 0000000..98ef919
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_init.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_init.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_largepage.cc b/libmysqlclient/mysql/mysys/my_largepage.cc
new file mode 120000
index 0000000..e20955e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_largepage.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_largepage.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_lib.cc b/libmysqlclient/mysql/mysys/my_lib.cc
new file mode 120000
index 0000000..f03f8c1
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_lib.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_lib.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_malloc.cc b/libmysqlclient/mysql/mysys/my_malloc.cc
new file mode 120000
index 0000000..92bb2fa
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_malloc.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_malloc.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_mess.cc b/libmysqlclient/mysql/mysys/my_mess.cc
new file mode 120000
index 0000000..84d0430
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_mess.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_mess.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_mkdir.cc b/libmysqlclient/mysql/mysys/my_mkdir.cc
new file mode 120000
index 0000000..a180e57
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_mkdir.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_mkdir.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_mmap.cc b/libmysqlclient/mysql/mysys/my_mmap.cc
new file mode 120000
index 0000000..4d6c5ae
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_mmap.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_mmap.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_murmur3.cc b/libmysqlclient/mysql/mysys/my_murmur3.cc
new file mode 120000
index 0000000..519fe48
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_murmur3.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_murmur3.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_once.cc b/libmysqlclient/mysql/mysys/my_once.cc
new file mode 120000
index 0000000..558eb69
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_once.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_once.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_open.cc b/libmysqlclient/mysql/mysys/my_open.cc
new file mode 120000
index 0000000..df074ad
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_open.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_open.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_pread.cc b/libmysqlclient/mysql/mysys/my_pread.cc
new file mode 120000
index 0000000..970c3e2
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_pread.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_pread.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_rdtsc.cc b/libmysqlclient/mysql/mysys/my_rdtsc.cc
new file mode 120000
index 0000000..bfbef95
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_rdtsc.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_rdtsc.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_read.cc b/libmysqlclient/mysql/mysys/my_read.cc
new file mode 120000
index 0000000..fd332b5
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_read.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_read.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_rename.cc b/libmysqlclient/mysql/mysys/my_rename.cc
new file mode 120000
index 0000000..087c283
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_rename.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_rename.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_seek.cc b/libmysqlclient/mysql/mysys/my_seek.cc
new file mode 120000
index 0000000..b5787d4
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_seek.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_seek.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_static.cc b/libmysqlclient/mysql/mysys/my_static.cc
new file mode 120000
index 0000000..da2bc5d
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_static.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_static.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_static.h b/libmysqlclient/mysql/mysys/my_static.h
new file mode 120000
index 0000000..8aff1d8
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_static.h
@@ -0,0 +1 @@
+../../../upstream/mysys/my_static.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_string.cc b/libmysqlclient/mysql/mysys/my_string.cc
new file mode 120000
index 0000000..465a4bd
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_string.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_string.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_symlink.cc b/libmysqlclient/mysql/mysys/my_symlink.cc
new file mode 120000
index 0000000..cf6bd73
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_symlink.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_symlink.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_symlink2.cc b/libmysqlclient/mysql/mysys/my_symlink2.cc
new file mode 120000
index 0000000..1094124
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_symlink2.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_symlink2.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_sync.cc b/libmysqlclient/mysql/mysys/my_sync.cc
new file mode 120000
index 0000000..4246f2e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_sync.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_sync.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_syslog.cc b/libmysqlclient/mysql/mysys/my_syslog.cc
new file mode 120000
index 0000000..149f3de
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_syslog.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_syslog.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_thr_init.cc b/libmysqlclient/mysql/mysys/my_thr_init.cc
new file mode 100644
index 0000000..ba10464
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_thr_init.cc
@@ -0,0 +1,385 @@
+/* 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.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   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 mysys/my_thr_init.cc
+  Functions to handle initialization and allocation of all mysys & debug
+  thread variables.
+*/
+
+#include <stdlib.h>
+#include <sys/types.h>
+#ifdef _WIN32
+#include <signal.h>
+#endif
+#include <time.h>
+
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "my_loglevel.h"
+#include "my_macros.h"
+#include "my_psi_config.h"
+#include "my_sys.h"
+#include "my_systime.h"
+#include "my_thread.h"
+#include "my_thread_local.h"
+#include "mysql/psi/mysql_cond.h"
+#include "mysql/psi/mysql_mutex.h"
+#include "mysql/psi/mysql_thread.h"
+#include "mysql/psi/psi_thread.h"
+#include "mysys/mysys_priv.h"
+#include "mysys_err.h"
+#include "thr_mutex.h"
+
+static bool my_thread_global_init_done = false;
+#ifndef DBUG_OFF
+static uint THR_thread_count = 0;
+static uint my_thread_end_wait_time = 5;
+static my_thread_id thread_id = 0;
+struct st_my_thread_var;
+static thread_local st_my_thread_var *THR_mysys = nullptr;
+#endif
+static thread_local int THR_myerrno = 0;
+#ifdef _WIN32
+static thread_local int THR_winerrno = 0;
+#endif
+
+mysql_mutex_t THR_LOCK_myisam_mmap;
+mysql_mutex_t THR_LOCK_myisam;
+mysql_mutex_t THR_LOCK_heap;
+mysql_mutex_t THR_LOCK_malloc;
+mysql_mutex_t THR_LOCK_open;
+mysql_mutex_t THR_LOCK_lock;
+mysql_mutex_t THR_LOCK_net;
+mysql_mutex_t THR_LOCK_charset;
+#ifndef DBUG_OFF
+mysql_mutex_t THR_LOCK_threads;
+mysql_cond_t THR_COND_threads;
+#endif
+
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+native_mutexattr_t my_fast_mutexattr;
+#endif
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+native_mutexattr_t my_errorcheck_mutexattr;
+#endif
+#ifdef _WIN32
+static void install_sigabrt_handler();
+#endif
+
+#ifndef DBUG_OFF
+struct st_my_thread_var {
+  my_thread_id id;
+  struct CODE_STATE *dbug;
+};
+
+static struct st_my_thread_var *mysys_thread_var() { return THR_mysys; }
+
+static int set_mysys_thread_var(struct st_my_thread_var *mysys_var) {
+  THR_mysys = mysys_var;
+  return 0;
+}
+#endif
+
+/**
+  Re-initialize components initialized early with @c my_thread_global_init.
+  Some mutexes were initialized before the instrumentation.
+  Destroy + create them again, now that the instrumentation
+  is in place.
+  This is safe, since this function() is called before creating new threads,
+  so the mutexes are not in use.
+*/
+
+void my_thread_global_reinit() {
+  DBUG_ASSERT(my_thread_global_init_done);
+
+#ifdef HAVE_PSI_INTERFACE
+  my_init_mysys_psi_keys();
+#endif
+
+  mysql_mutex_destroy(&THR_LOCK_heap);
+  mysql_mutex_init(key_THR_LOCK_heap, &THR_LOCK_heap, MY_MUTEX_INIT_FAST);
+
+  mysql_mutex_destroy(&THR_LOCK_net);
+  mysql_mutex_init(key_THR_LOCK_net, &THR_LOCK_net, MY_MUTEX_INIT_FAST);
+
+  mysql_mutex_destroy(&THR_LOCK_myisam);
+  mysql_mutex_init(key_THR_LOCK_myisam, &THR_LOCK_myisam, MY_MUTEX_INIT_SLOW);
+
+  mysql_mutex_destroy(&THR_LOCK_malloc);
+  mysql_mutex_init(key_THR_LOCK_malloc, &THR_LOCK_malloc, MY_MUTEX_INIT_FAST);
+
+  mysql_mutex_destroy(&THR_LOCK_open);
+  mysql_mutex_init(key_THR_LOCK_open, &THR_LOCK_open, MY_MUTEX_INIT_FAST);
+
+  mysql_mutex_destroy(&THR_LOCK_charset);
+  mysql_mutex_init(key_THR_LOCK_charset, &THR_LOCK_charset, MY_MUTEX_INIT_FAST);
+
+#ifndef DBUG_OFF
+  mysql_mutex_destroy(&THR_LOCK_threads);
+  mysql_mutex_init(key_THR_LOCK_threads, &THR_LOCK_threads, MY_MUTEX_INIT_FAST);
+
+  mysql_cond_destroy(&THR_COND_threads);
+  mysql_cond_init(key_THR_COND_threads, &THR_COND_threads);
+#endif
+}
+
+/**
+  initialize thread environment
+
+  @retval  false  ok
+  @retval  true   error
+*/
+
+bool my_thread_global_init() {
+  if (my_thread_global_init_done) return false;
+  my_thread_global_init_done = true;
+
+#if defined(SAFE_MUTEX)
+  safe_mutex_global_init(); /* Must be called early */
+#endif
+
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+  /*
+    Set mutex type to "fast" a.k.a "adaptive"
+
+    In this case the thread may steal the mutex from some other thread
+    that is waiting for the same mutex.  This will save us some
+    context switches but may cause a thread to 'starve forever' while
+    waiting for the mutex (not likely if the code within the mutex is
+    short).
+  */
+  pthread_mutexattr_init(&my_fast_mutexattr);
+  pthread_mutexattr_settype(&my_fast_mutexattr, PTHREAD_MUTEX_ADAPTIVE_NP);
+#endif
+
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+  /*
+    Set mutex type to "errorcheck"
+  */
+  pthread_mutexattr_init(&my_errorcheck_mutexattr);
+  pthread_mutexattr_settype(&my_errorcheck_mutexattr, PTHREAD_MUTEX_ERRORCHECK);
+#endif
+
+  mysql_mutex_init(key_THR_LOCK_malloc, &THR_LOCK_malloc, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_open, &THR_LOCK_open, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_charset, &THR_LOCK_charset, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_lock, &THR_LOCK_lock, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_myisam, &THR_LOCK_myisam, MY_MUTEX_INIT_SLOW);
+  mysql_mutex_init(key_THR_LOCK_myisam_mmap, &THR_LOCK_myisam_mmap,
+                   MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_heap, &THR_LOCK_heap, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_THR_LOCK_net, &THR_LOCK_net, MY_MUTEX_INIT_FAST);
+#ifndef DBUG_OFF
+  mysql_mutex_init(key_THR_LOCK_threads, &THR_LOCK_threads, MY_MUTEX_INIT_FAST);
+  mysql_cond_init(key_THR_COND_threads, &THR_COND_threads);
+#endif
+
+  return false;
+}
+
+void my_thread_global_end() {
+#ifndef DBUG_OFF
+  struct timespec abstime;
+  bool all_threads_killed = true;
+
+  set_timespec(&abstime, my_thread_end_wait_time);
+  mysql_mutex_lock(&THR_LOCK_threads);
+  while (THR_thread_count > 0) {
+    int error =
+        mysql_cond_timedwait(&THR_COND_threads, &THR_LOCK_threads, &abstime);
+    if (is_timeout(error)) {
+#ifndef _WIN32
+      /*
+        We shouldn't give an error here, because if we don't have
+        pthread_kill(), programs like mysqld can't ensure that all threads
+        are killed when we enter here.
+      */
+      if (THR_thread_count) /* purecov: begin inspected */
+        my_message_local(ERROR_LEVEL, EE_FAILED_TO_KILL_ALL_THREADS,
+                         THR_thread_count);
+        /* purecov: end */
+#endif
+      all_threads_killed = false;
+      break;
+    }
+  }
+  mysql_mutex_unlock(&THR_LOCK_threads);
+#endif
+
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_destroy(&my_fast_mutexattr);
+#endif
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_destroy(&my_errorcheck_mutexattr);
+#endif
+  mysql_mutex_destroy(&THR_LOCK_malloc);
+  mysql_mutex_destroy(&THR_LOCK_open);
+  mysql_mutex_destroy(&THR_LOCK_lock);
+  mysql_mutex_destroy(&THR_LOCK_myisam);
+  mysql_mutex_destroy(&THR_LOCK_myisam_mmap);
+  mysql_mutex_destroy(&THR_LOCK_heap);
+  mysql_mutex_destroy(&THR_LOCK_net);
+  mysql_mutex_destroy(&THR_LOCK_charset);
+#ifndef DBUG_OFF
+  if (all_threads_killed) {
+    mysql_mutex_destroy(&THR_LOCK_threads);
+    mysql_cond_destroy(&THR_COND_threads);
+  }
+#endif
+
+  my_thread_global_init_done = false;
+}
+
+/**
+  Allocate thread specific memory for the thread, used by mysys and dbug
+
+  @note This function may called multiple times for a thread, for example
+  if one uses my_init() followed by mysql_server_init().
+
+  @retval false  ok
+  @retval true   Fatal error; mysys/dbug functions can't be used
+*/
+
+extern "C" bool my_thread_init() {
+#ifndef DBUG_OFF
+  struct st_my_thread_var *tmp;
+#endif
+
+  if (!my_thread_global_init_done)
+    return true; /* cannot proceed with unintialized library */
+
+#ifdef _WIN32
+  install_sigabrt_handler();
+#endif
+
+#ifndef DBUG_OFF
+  if (mysys_thread_var()) return false;
+
+  if (!(tmp = (struct st_my_thread_var *)calloc(1, sizeof(*tmp)))) return true;
+
+  mysql_mutex_lock(&THR_LOCK_threads);
+  tmp->id = ++thread_id;
+  ++THR_thread_count;
+  mysql_mutex_unlock(&THR_LOCK_threads);
+  set_mysys_thread_var(tmp);
+#endif
+
+  return false;
+}
+
+/**
+  Deallocate memory used by the thread for book-keeping
+
+  @note This may be called multiple times for a thread.
+  This happens for example when one calls 'mysql_server_init()'
+  mysql_server_end() and then ends with a mysql_end().
+*/
+
+extern "C" void my_thread_end() {
+#ifndef DBUG_OFF
+  struct st_my_thread_var *tmp = mysys_thread_var();
+#endif
+
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  /*
+    Remove the instrumentation for this thread.
+    This must be done before trashing st_my_thread_var,
+    because the LF_HASH depends on it.
+  */
+  PSI_THREAD_CALL(delete_current_thread)();
+#endif
+
+#if !defined(DBUG_OFF)
+  if (tmp) {
+    /* tmp->dbug is allocated inside DBUG library */
+    if (tmp->dbug) {
+      DBUG_POP();
+      free(tmp->dbug);
+      tmp->dbug = NULL;
+    }
+    free(tmp);
+
+    /*
+      Decrement counter for number of running threads. We are using this
+      in my_thread_global_end() to wait until all threads have called
+      my_thread_end and thus freed all memory they have allocated in
+      my_thread_init() and DBUG_xxxx
+    */
+    mysql_mutex_lock(&THR_LOCK_threads);
+    DBUG_ASSERT(THR_thread_count != 0);
+    if (--THR_thread_count == 0) mysql_cond_signal(&THR_COND_threads);
+    mysql_mutex_unlock(&THR_LOCK_threads);
+  }
+  set_mysys_thread_var(NULL);
+#endif
+}
+
+int my_errno() { return THR_myerrno; }
+
+void set_my_errno(int my_errno) { THR_myerrno = my_errno; }
+
+#ifdef _WIN32
+int thr_winerr() { return THR_winerrno; }
+
+void set_thr_winerr(int winerr) { THR_winerrno = winerr; }
+#endif
+
+#ifndef DBUG_OFF
+my_thread_id my_thread_var_id() { return mysys_thread_var()->id; }
+
+void set_my_thread_var_id(my_thread_id id) { mysys_thread_var()->id = id; }
+
+CODE_STATE **my_thread_var_dbug() {
+  struct st_my_thread_var *tmp = THR_mysys;
+  return tmp ? &tmp->dbug : NULL;
+}
+#endif /* DBUG_OFF */
+
+#ifdef _WIN32
+/*
+  In Visual Studio 2005 and later, default SIGABRT handler will overwrite
+  any unhandled exception filter set by the application  and will try to
+  call JIT debugger. This is not what we want, this we calling __debugbreak
+  to stop in debugger, if process is being debugged or to generate
+  EXCEPTION_BREAKPOINT and then handle_segfault will do its magic.
+*/
+
+static void my_sigabrt_handler(int sig) { __debugbreak(); }
+
+static void install_sigabrt_handler() {
+  /*abort() should not override our exception filter*/
+
+  // Requires msvcrt90 or later but forcing this in a library is
+  // probably not a good idea.
+  //
+#ifndef __MINGW32__
+  _set_abort_behavior(0, _CALL_REPORTFAULT);
+#endif
+  signal(SIGABRT, my_sigabrt_handler);
+}
+#endif
diff --git a/libmysqlclient/mysql/mysys/my_thr_init.cc.orig b/libmysqlclient/mysql/mysys/my_thr_init.cc.orig
new file mode 120000
index 0000000..cf23bc8
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_thr_init.cc.orig
@@ -0,0 +1 @@
+../../../upstream/mysys/my_thr_init.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_thread.cc b/libmysqlclient/mysql/mysys/my_thread.cc
new file mode 120000
index 0000000..9e79b5a
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_thread.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_thread.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_time.cc b/libmysqlclient/mysql/mysys/my_time.cc
new file mode 120000
index 0000000..429ec3f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_time.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_time.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_timespec.cc b/libmysqlclient/mysql/mysys/my_timespec.cc
new file mode 120000
index 0000000..ddf2c33
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_timespec.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_timespec.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_user.cc b/libmysqlclient/mysql/mysys/my_user.cc
new file mode 120000
index 0000000..c43c366
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_user.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_user.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_windac.cc b/libmysqlclient/mysql/mysys/my_windac.cc
new file mode 120000
index 0000000..7520971
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_windac.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_windac.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_winerr.cc b/libmysqlclient/mysql/mysys/my_winerr.cc
new file mode 120000
index 0000000..a5ef48e
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_winerr.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_winerr.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_winfile.cc b/libmysqlclient/mysql/mysys/my_winfile.cc
new file mode 120000
index 0000000..bc4f86f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_winfile.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_winfile.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/my_write.cc b/libmysqlclient/mysql/mysys/my_write.cc
new file mode 120000
index 0000000..b867c30
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/my_write.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/my_write.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/mysys_priv.h b/libmysqlclient/mysql/mysys/mysys_priv.h
new file mode 120000
index 0000000..5cd0b9a
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/mysys_priv.h
@@ -0,0 +1 @@
+../../../upstream/mysys/mysys_priv.h
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/pack.cc b/libmysqlclient/mysql/mysys/pack.cc
new file mode 120000
index 0000000..23feed3
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/pack.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/pack.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/posix_timers.cc b/libmysqlclient/mysql/mysys/posix_timers.cc
new file mode 120000
index 0000000..9b56f9f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/posix_timers.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/posix_timers.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/print_version.cc b/libmysqlclient/mysql/mysys/print_version.cc
new file mode 120000
index 0000000..1339d65
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/print_version.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/print_version.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/psi_noop.cc b/libmysqlclient/mysql/mysys/psi_noop.cc
new file mode 120000
index 0000000..766cc41
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/psi_noop.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/psi_noop.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/ptr_cmp.cc b/libmysqlclient/mysql/mysys/ptr_cmp.cc
new file mode 120000
index 0000000..a972834
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/ptr_cmp.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/ptr_cmp.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/sql_chars.cc b/libmysqlclient/mysql/mysys/sql_chars.cc
new file mode 120000
index 0000000..33ae259
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/sql_chars.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/sql_chars.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/stacktrace.cc b/libmysqlclient/mysql/mysys/stacktrace.cc
new file mode 100644
index 0000000..9f7e443
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/stacktrace.cc
@@ -0,0 +1,784 @@
+/* Copyright (c) 2001, 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.
+
+   Without limiting anything contained in the foregoing, this file,
+   which is part of C Driver for MySQL (Connector/C), is also subject to the
+   Universal FOSS Exception, version 1.0, a copy of which can be found at
+   http://oss.oracle.com/licenses/universal-foss-exception.
+
+   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 mysys/stacktrace.cc
+*/
+
+#include "my_config.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#ifdef __linux__
+#include <syscall.h>
+#endif
+#include <time.h>
+
+#include "my_inttypes.h"
+#include "my_macros.h"
+#include "my_stacktrace.h"
+
+#ifndef _WIN32
+#include <signal.h>
+
+#include "my_thread.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STACKTRACE
+
+#ifdef __linux__
+#include <ctype.h> /* isprint */
+#endif
+
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
+#endif
+
+#ifdef __linux__
+/* __bss_start doesn't seem to work on FreeBSD and doesn't exist on OSX/Solaris.
+ */
+#define PTR_SANE(p) \
+  ((p) && (char *)(p) >= heap_start && (char *)(p) <= heap_end)
+static char *heap_start;
+extern char *__bss_start;
+#else
+#define PTR_SANE(p) (p)
+#endif /* __linux */
+
+void my_init_stacktrace() {
+#ifdef __linux__
+  heap_start = (char *)&__bss_start;
+#endif /* __linux__ */
+}
+
+#ifdef __linux__
+
+static void print_buffer(char *buffer, size_t count) {
+  const char s[] = " ";
+  for (; count && *buffer; --count) {
+    my_write_stderr(isprint(*buffer) ? buffer : s, 1);
+    ++buffer;
+  }
+}
+
+/**
+  Access the pages of this process through /proc/self/task/<tid>/mem
+  in order to safely print the contents of a memory address range.
+
+  @param  addr      The address at the start of the memory region.
+  @param  max_len   The length of the memory region.
+
+  @return Zero on success.
+*/
+static int safe_print_str(const char *addr, int max_len) {
+  int fd;
+  pid_t tid;
+  off_t offset;
+  ssize_t nbytes = 0;
+  size_t total, count;
+  char buf[256];
+
+  tid = (pid_t)syscall(SYS_gettid);
+
+  sprintf(buf, "/proc/self/task/%d/mem", tid);
+
+  if ((fd = open(buf, O_RDONLY)) < 0) return -1;
+
+  static_assert(sizeof(off_t) >= sizeof(intptr),
+                "off_t needs to be able to hold a pointer.");
+
+  total = max_len;
+  offset = (intptr)addr;
+
+  /* Read up to the maximum number of bytes. */
+  while (total) {
+    count = MY_MIN(sizeof(buf), total);
+
+    if ((nbytes = pread(fd, buf, count, offset)) < 0) {
+      /* Just in case... */
+      if (errno == EINTR)
+        continue;
+      else
+        break;
+    }
+
+    /* Advance offset into memory. */
+    total -= nbytes;
+    offset += nbytes;
+    addr += nbytes;
+
+    /* Output the printable characters. */
+    print_buffer(buf, nbytes);
+
+    /* Break if less than requested... */
+    if ((count - nbytes)) break;
+  }
+
+  /* Output a new line if something was printed. */
+  if (total != (size_t)max_len) my_safe_printf_stderr("%s", "\n");
+
+  if (nbytes == -1) my_safe_printf_stderr("Can't read from address %p\n", addr);
+
+  close(fd);
+
+  return 0;
+}
+
+#endif /* __linux __ */
+
+void my_safe_puts_stderr(const char *val, size_t max_len) {
+#ifdef __linux__
+  if (!safe_print_str(val, max_len)) return;
+
+  /* Only needed by the linux version of PTR_SANE */
+  char *heap_end = (char *)sbrk(0);
+#endif
+
+  if (!PTR_SANE(val)) {
+    my_safe_printf_stderr("%s", "is an invalid pointer\n");
+    return;
+  }
+
+  for (; max_len && PTR_SANE(val) && *val; --max_len)
+    my_write_stderr((val++), 1);
+  my_safe_printf_stderr("%s", "\n");
+}
+
+#if defined(HAVE_PRINTSTACK)
+
+/* Use Solaris' symbolic stack trace routine. */
+#include <ucontext.h>
+
+void my_print_stacktrace(uchar *stack_bottom MY_ATTRIBUTE((unused)),
+                         ulong thread_stack MY_ATTRIBUTE((unused))) {
+  if (printstack(fileno(stderr)) == -1)
+    my_safe_printf_stderr(
+        "%s", "Error when traversing the stack, stack appears corrupt.\n");
+  else
+    my_safe_printf_stderr(
+        "Please read "
+        "http://dev.mysql.com/doc/refman/%u.%u/en/resolve-stack-dump.html\n"
+        "and follow instructions on how to resolve the stack trace.\n"
+        "Resolved stack trace is much more helpful in diagnosing the\n"
+        "problem, so please do resolve it\n",
+        MYSQL_VERSION_MAJOR, MYSQL_VERSION_MINOR);
+}
+
+#elif defined(HAVE_BACKTRACE)
+
+#ifdef HAVE_ABI_CXA_DEMANGLE
+
+#include <cxxabi.h>
+
+static char *my_demangle(const char *mangled_name, int *status) {
+  return abi::__cxa_demangle(mangled_name, NULL, NULL, status);
+}
+
+static bool my_demangle_symbol(char *line) {
+  char *demangled = NULL;
+#ifdef __APPLE__  // OS X formatting of stacktraces is different from Linux
+  char *begin = strstr(line, "_Z");
+  char *end = begin ? strchr(begin, ' ') : NULL;
+
+  if (begin && end) {
+    begin[-1] = '\0';
+    *end = '\0';
+    int status;
+    demangled = my_demangle(begin, &status);
+    if (!demangled || status) {
+      demangled = NULL;
+      begin[-1] = '_';
+      *end = ' ';
+    }
+  }
+  if (demangled) my_safe_printf_stderr("%s %s %s\n", line, demangled, end + 1);
+#else             // !__APPLE__
+  char *begin = strchr(line, '(');
+  char *end = begin ? strchr(begin, '+') : NULL;
+
+  if (begin && end) {
+    *begin++ = *end++ = '\0';
+    int status;
+    demangled = my_demangle(begin, &status);
+    if (!demangled || status) {
+      demangled = NULL;
+      begin[-1] = '(';
+      end[-1] = '+';
+    }
+  }
+  if (demangled) my_safe_printf_stderr("%s(%s+%s\n", line, demangled, end);
+#endif            // !__APPLE__
+  bool ret = (demangled == NULL);
+  free(demangled);
+  return (ret);
+}
+
+static void my_demangle_symbols(char **addrs, int n) {
+  for (int i = 0; i < n; i++) {
+    if (my_demangle_symbol(addrs[i]))  // demangling failed
+      my_safe_printf_stderr("%s\n", addrs[i]);
+  }
+}
+
+#endif /* HAVE_ABI_CXA_DEMANGLE */
+
+void my_print_stacktrace(uchar *stack_bottom, ulong thread_stack) {
+  void *addrs[128];
+  char **strings = NULL;
+  int n = backtrace(addrs, array_elements(addrs));
+  my_safe_printf_stderr("stack_bottom = %p thread_stack 0x%lx\n", stack_bottom,
+                        thread_stack);
+#ifdef HAVE_ABI_CXA_DEMANGLE
+  if ((strings = backtrace_symbols(addrs, n))) {
+    my_demangle_symbols(strings, n);
+    free(strings);
+  }
+#endif
+  if (!strings) {
+    backtrace_symbols_fd(addrs, n, fileno(stderr));
+  }
+}
+
+#endif /* HAVE_PRINTSTACK || HAVE_BACKTRACE */
+#endif /* HAVE_STACKTRACE */
+
+/* Produce a core for the thread */
+void my_write_core(int sig) {
+  signal(sig, SIG_DFL);
+  pthread_kill(my_thread_self(), sig);
+#if defined(P_MYID)
+  /* On Solaris, the above kill is not enough */
+  sigsend(P_PID, P_MYID, sig);
+#endif
+}
+
+#else /* _WIN32*/
+
+#include <dbghelp.h>
+#include <tlhelp32.h>
+#if _MSC_VER
+#pragma comment(lib, "dbghelp")
+#endif
+
+static EXCEPTION_POINTERS *exception_ptrs;
+
+#define MODULE64_SIZE_WINXP 576
+#define STACKWALK_MAX_FRAMES 64
+
+void my_init_stacktrace() {}
+
+void my_set_exception_pointers(EXCEPTION_POINTERS *ep) { exception_ptrs = ep; }
+
+/*
+  Appends directory to symbol path.
+*/
+static void add_to_symbol_path(char *path, size_t path_buffer_size, char *dir,
+                               size_t dir_buffer_size) {
+  strcat_s(dir, dir_buffer_size, ";");
+  if (!strstr(path, dir)) {
+    strcat_s(path, path_buffer_size, dir);
+  }
+}
+
+/*
+  Get symbol path - semicolon-separated list of directories to search for debug
+  symbols. We expect PDB in the same directory as corresponding exe or dll,
+  so the path is build from directories of the loaded modules. If environment
+  variable _NT_SYMBOL_PATH is set, it's value appended to the symbol search path
+*/
+static void get_symbol_path(char *path, size_t size) {
+  HANDLE hSnap;
+  char *envvar;
+  char *p;
+#ifndef DBUG_OFF
+  static char pdb_debug_dir[MAX_PATH + 7];
+#endif
+
+  path[0] = '\0';
+
+#ifndef DBUG_OFF
+  /*
+    Add "debug" subdirectory of the application directory, sometimes PDB will
+    placed here by installation.
+  */
+  GetModuleFileName(NULL, pdb_debug_dir, MAX_PATH);
+  p = strrchr(pdb_debug_dir, '\\');
+  if (p) {
+    *p = 0;
+    strcat_s(pdb_debug_dir, sizeof(pdb_debug_dir), "\\debug;");
+    add_to_symbol_path(path, size, pdb_debug_dir, sizeof(pdb_debug_dir));
+  }
+#endif
+
+  /*
+    Enumerate all modules, and add their directories to the path.
+    Avoid duplicate entries.
+  */
+  hSnap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
+  if (hSnap != INVALID_HANDLE_VALUE) {
+    BOOL ret;
+    MODULEENTRY32 mod;
+    mod.dwSize = sizeof(MODULEENTRY32);
+    for (ret = Module32First(hSnap, &mod); ret;
+         ret = Module32Next(hSnap, &mod)) {
+      char *module_dir = mod.szExePath;
+      p = strrchr(module_dir, '\\');
+      if (!p) {
+        /*
+          Path separator was not found. Not known to happen, if ever happens,
+          will indicate current directory.
+        */
+        module_dir[0] = '.';
+        module_dir[1] = '\0';
+      } else {
+        *p = '\0';
+      }
+      add_to_symbol_path(path, size, module_dir, sizeof(mod.szExePath));
+    }
+    CloseHandle(hSnap);
+  }
+
+  /* Add _NT_SYMBOL_PATH, if present. */
+  envvar = getenv("_NT_SYMBOL_PATH");
+  if (envvar) {
+    strcat_s(path, size, envvar);
+  }
+}
+
+#define MAX_SYMBOL_PATH 32768
+
+/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
+#ifndef SYMOPT_NO_PROMPTS
+#define SYMOPT_NO_PROMPTS 0
+#endif
+
+void my_print_stacktrace(uchar *unused1, ulong unused2) {
+  HANDLE hProcess = GetCurrentProcess();
+  HANDLE hThread = GetCurrentThread();
+  static IMAGEHLP_MODULE64 module = {sizeof(module)};
+  static IMAGEHLP_SYMBOL64_PACKAGE package;
+  DWORD64 addr;
+  DWORD machine;
+  int i;
+  CONTEXT context;
+  STACKFRAME64 frame = {0};
+  static char symbol_path[MAX_SYMBOL_PATH];
+
+  if (!exception_ptrs) return;
+
+  /* Copy context, as stackwalking on original will unwind the stack */
+  context = *(exception_ptrs->ContextRecord);
+  /*Initialize symbols.*/
+  SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_NO_PROMPTS | SYMOPT_DEFERRED_LOADS |
+                SYMOPT_DEBUG);
+  get_symbol_path(symbol_path, sizeof(symbol_path));
+  SymInitialize(hProcess, symbol_path, true);
+
+  /*Prepare stackframe for the first StackWalk64 call*/
+  frame.AddrFrame.Mode = frame.AddrPC.Mode = frame.AddrStack.Mode =
+      AddrModeFlat;
+#if (defined _M_X64)
+  machine = IMAGE_FILE_MACHINE_AMD64;
+  frame.AddrFrame.Offset = context.Rbp;
+  frame.AddrPC.Offset = context.Rip;
+  frame.AddrStack.Offset = context.Rsp;
+#else
+  /*There is currently no need to support IA64*/
+#pragma error("unsupported architecture")
+#endif
+
+  package.sym.SizeOfStruct = sizeof(package.sym);
+  package.sym.MaxNameLength = sizeof(package.name);
+
+  /*Walk the stack, output useful information*/
+  for (i = 0; i < STACKWALK_MAX_FRAMES; i++) {
+    DWORD64 function_offset = 0;
+    DWORD line_offset = 0;
+    IMAGEHLP_LINE64 line = {sizeof(line)};
+    BOOL have_module = false;
+    BOOL have_symbol = false;
+    BOOL have_source = false;
+
+    if (!StackWalk64(machine, hProcess, hThread, &frame, &context, 0, 0, 0, 0))
+      break;
+    addr = frame.AddrPC.Offset;
+
+    have_module = SymGetModuleInfo64(hProcess, addr, &module);
+    have_symbol =
+        SymGetSymFromAddr64(hProcess, addr, &function_offset, &(package.sym));
+    have_source = SymGetLineFromAddr64(hProcess, addr, &line_offset, &line);
+
+    my_safe_printf_stderr("%p    ", addr);
+    if (have_module) {
+      char *base_image_name = strrchr(module.ImageName, '\\');
+      if (base_image_name)
+        base_image_name++;
+      else
+        base_image_name = module.ImageName;
+      my_safe_printf_stderr("%s!", base_image_name);
+    }
+    if (have_symbol)
+      my_safe_printf_stderr("%s()", package.sym.Name);
+
+    else if (have_module)
+      my_safe_printf_stderr("%s", "???");
+
+    if (have_source) {
+      char *base_file_name = strrchr(line.FileName, '\\');
+      if (base_file_name)
+        base_file_name++;
+      else
+        base_file_name = line.FileName;
+      my_safe_printf_stderr("[%s:%u]", base_file_name, line.LineNumber);
+    }
+    my_safe_printf_stderr("%s", "\n");
+  }
+}
+
+/*
+  Write dump. The dump is created in current directory,
+  file name is constructed from executable name plus
+  ".dmp" extension
+*/
+void my_write_core(int unused) {
+  char path[MAX_PATH];
+  // See comment below for clarification about size of dump_fname
+  char dump_fname[MAX_PATH + 1 + 10 + 4 + 1] = "core.dmp";
+
+  if (!exception_ptrs) return;
+
+  if (GetModuleFileName(NULL, path, sizeof(path))) {
+    char module_name[MAX_PATH];
+    _splitpath(path, NULL, NULL, module_name, NULL);
+    // max length of a value being placed to dump_fname is
+    // MAX_PATH + 1 byte for '.' + up to 10 bytes for string
+    // representation of DWORD value + 4 bytes for .dmp suffix +
+    // 1 byte for termitated \0. Such size of output buffer guarantees
+    // that there is enough space to place a result of string formatting
+    // performed by snprintf().
+    snprintf(dump_fname, sizeof(dump_fname), "%s.%u.dmp", module_name,
+             GetCurrentProcessId());
+  }
+  my_create_minidump(dump_fname, 0, 0);
+}
+
+/** Create a minidump.
+  @param name    path of minidump file.
+  @param process HANDLE to process. (0 for own process).
+  @param pid     Process id.
+*/
+
+void my_create_minidump(const char *name, HANDLE process, DWORD pid) {
+  char path[MAX_PATH];
+  MINIDUMP_EXCEPTION_INFORMATION info;
+  PMINIDUMP_EXCEPTION_INFORMATION info_ptr = NULL;
+  HANDLE hFile;
+
+  if (process == 0) {
+    /* Does not need to CloseHandle() for the below. */
+    process = GetCurrentProcess();
+    pid = GetCurrentProcessId();
+    info.ExceptionPointers = exception_ptrs;
+    info.ClientPointers = false;
+    info.ThreadId = GetCurrentThreadId();
+    info_ptr = &info;
+  }
+
+  hFile = CreateFile(name, GENERIC_WRITE, 0, 0, CREATE_ALWAYS,
+                     FILE_ATTRIBUTE_NORMAL, 0);
+  if (hFile) {
+    MINIDUMP_TYPE mdt =
+        (MINIDUMP_TYPE)(MiniDumpNormal | MiniDumpWithThreadInfo |
+                        MiniDumpWithProcessThreadData);
+    /* Create minidump, use info only if same process. */
+    if (MiniDumpWriteDump(process, pid, hFile, mdt, info_ptr, 0, 0)) {
+      my_safe_printf_stderr("Minidump written to %s\n",
+                            _fullpath(path, name, sizeof(path)) ? path : name);
+    } else {
+      my_safe_printf_stderr("MiniDumpWriteDump() failed, last error %d\n",
+                            GetLastError());
+    }
+    CloseHandle(hFile);
+  } else {
+    my_safe_printf_stderr("CreateFile(%s) failed, last error %d\n", name,
+                          GetLastError());
+  }
+}
+
+void my_safe_puts_stderr(const char *val, size_t len) {
+#ifndef __MINGW32__
+  __try {
+#endif
+    my_write_stderr(val, len);
+    my_safe_printf_stderr("%s", "\n");
+#ifndef __MINGW32__
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+    my_safe_printf_stderr("%s", "is an invalid string pointer\n");
+  }
+#endif
+}
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+size_t my_write_stderr(const void *buf, size_t count) {
+  DWORD bytes_written;
+  SetFilePointer(GetStdHandle(STD_ERROR_HANDLE), 0, NULL, FILE_END);
+  WriteFile(GetStdHandle(STD_ERROR_HANDLE), buf, (DWORD)count, &bytes_written,
+            NULL);
+  return bytes_written;
+}
+#else
+size_t my_write_stderr(const void *buf, size_t count) {
+  return (size_t)write(STDERR_FILENO, buf, count);
+}
+#endif
+
+static const char digits[] = "0123456789abcdef";
+
+char *my_safe_utoa(int base, ulonglong val, char *buf) {
+  *buf-- = 0;
+  do {
+    *buf-- = digits[val % base];
+  } while ((val /= base) != 0);
+  return buf + 1;
+}
+
+char *my_safe_itoa(int base, longlong val, char *buf) {
+  char *orig_buf = buf;
+  const bool is_neg = (val < 0);
+  *buf-- = 0;
+
+  if (is_neg) val = -val;
+  if (is_neg && base == 16) {
+    int ix;
+    val -= 1;
+    for (ix = 0; ix < 16; ++ix) buf[-ix] = '0';
+  }
+
+  do {
+    *buf-- = digits[val % base];
+  } while ((val /= base) != 0);
+
+  if (is_neg && base == 10) *buf-- = '-';
+
+  if (is_neg && base == 16) {
+    int ix;
+    buf = orig_buf - 1;
+    for (ix = 0; ix < 16; ++ix, --buf) {
+      switch (*buf) {
+        case '0':
+          *buf = 'f';
+          break;
+        case '1':
+          *buf = 'e';
+          break;
+        case '2':
+          *buf = 'd';
+          break;
+        case '3':
+          *buf = 'c';
+          break;
+        case '4':
+          *buf = 'b';
+          break;
+        case '5':
+          *buf = 'a';
+          break;
+        case '6':
+          *buf = '9';
+          break;
+        case '7':
+          *buf = '8';
+          break;
+        case '8':
+          *buf = '7';
+          break;
+        case '9':
+          *buf = '6';
+          break;
+        case 'a':
+          *buf = '5';
+          break;
+        case 'b':
+          *buf = '4';
+          break;
+        case 'c':
+          *buf = '3';
+          break;
+        case 'd':
+          *buf = '2';
+          break;
+        case 'e':
+          *buf = '1';
+          break;
+        case 'f':
+          *buf = '0';
+          break;
+      }
+    }
+  }
+  return buf + 1;
+}
+
+static const char *check_longlong(const char *fmt, bool *have_longlong) {
+  *have_longlong = false;
+  if (*fmt == 'l') {
+    fmt++;
+    if (*fmt != 'l')
+      *have_longlong = (sizeof(long) == sizeof(longlong));
+    else {
+      fmt++;
+      *have_longlong = true;
+    }
+  }
+  return fmt;
+}
+
+static size_t my_safe_vsnprintf(char *to, size_t size, const char *format,
+                                va_list ap) {
+  char *start = to;
+  char *end = start + size - 1;
+  for (; *format; ++format) {
+    bool have_longlong = false;
+    if (*format != '%') {
+      if (to == end) /* end of buffer */
+        break;
+      *to++ = *format; /* copy ordinary char */
+      continue;
+    }
+    ++format; /* skip '%' */
+
+    format = check_longlong(format, &have_longlong);
+
+    switch (*format) {
+      case 'd':
+      case 'i':
+      case 'u':
+      case 'x':
+      case 'p': {
+        longlong ival = 0;
+        ulonglong uval = 0;
+        if (*format == 'p')
+          have_longlong = (sizeof(void *) == sizeof(longlong));
+        if (have_longlong) {
+          if (*format == 'u')
+            uval = va_arg(ap, ulonglong);
+          else
+            ival = va_arg(ap, longlong);
+        } else {
+          if (*format == 'u')
+            uval = va_arg(ap, unsigned int);
+          else
+            ival = va_arg(ap, int);
+        }
+
+        {
+          char buff[22];
+          const int base = (*format == 'x' || *format == 'p') ? 16 : 10;
+          char *val_as_str =
+              (*format == 'u')
+                  ? my_safe_utoa(base, uval, &buff[sizeof(buff) - 1])
+                  : my_safe_itoa(base, ival, &buff[sizeof(buff) - 1]);
+
+          /*
+            Strip off "ffffffff" if we have 'x' format without 'll'
+            Similarly for 'p' format on 32bit systems.
+          */
+          if (base == 16 && !have_longlong && ival < 0) val_as_str += 8;
+
+          while (*val_as_str && to < end) *to++ = *val_as_str++;
+          continue;
+        }
+      }
+      case 's': {
+        const char *val = va_arg(ap, char *);
+        if (!val) val = "(null)";
+        while (*val && to < end) *to++ = *val++;
+        continue;
+      }
+    }
+  }
+  *to = 0;
+  return to - start;
+}
+
+size_t my_safe_snprintf(char *to, size_t n, const char *fmt, ...) {
+  size_t result;
+  va_list args;
+  va_start(args, fmt);
+  result = my_safe_vsnprintf(to, n, fmt, args);
+  va_end(args);
+  return result;
+}
+
+size_t my_safe_printf_stderr(const char *fmt, ...) {
+  char to[512];
+  size_t result;
+  va_list args;
+  va_start(args, fmt);
+  result = my_safe_vsnprintf(to, sizeof(to), fmt, args);
+  va_end(args);
+  my_write_stderr(to, result);
+  return result;
+}
+
+void my_safe_print_system_time() {
+  char hrs_buf[3] = "00";
+  char mins_buf[3] = "00";
+  char secs_buf[3] = "00";
+  int base = 10;
+#ifdef _WIN32
+  SYSTEMTIME utc_time;
+  long hrs, mins, secs;
+  GetSystemTime(&utc_time);
+  hrs = utc_time.wHour;
+  mins = utc_time.wMinute;
+  secs = utc_time.wSecond;
+#else
+  /* Using time() instead of my_time() to avoid looping */
+  const time_t curr_time = time(NULL);
+  /* Calculate time of day */
+  const long tmins = curr_time / 60;
+  const long thrs = tmins / 60;
+  const long hrs = thrs % 24;
+  const long mins = tmins % 60;
+  const long secs = curr_time % 60;
+#endif
+
+  my_safe_itoa(base, hrs, &hrs_buf[2]);
+  my_safe_itoa(base, mins, &mins_buf[2]);
+  my_safe_itoa(base, secs, &secs_buf[2]);
+
+  my_safe_printf_stderr("---------- %s:%s:%s UTC - ", hrs_buf, mins_buf,
+                        secs_buf);
+}
diff --git a/libmysqlclient/mysql/mysys/stacktrace.cc.orig b/libmysqlclient/mysql/mysys/stacktrace.cc.orig
new file mode 120000
index 0000000..ca3963b
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/stacktrace.cc.orig
@@ -0,0 +1 @@
+../../../upstream/mysys/stacktrace.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/thr_cond.cc b/libmysqlclient/mysql/mysys/thr_cond.cc
new file mode 120000
index 0000000..366c4bb
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/thr_cond.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/thr_cond.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/thr_lock.cc b/libmysqlclient/mysql/mysys/thr_lock.cc
new file mode 120000
index 0000000..607d646
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/thr_lock.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/thr_lock.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/thr_mutex.cc b/libmysqlclient/mysql/mysys/thr_mutex.cc
new file mode 120000
index 0000000..85bbc0f
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/thr_mutex.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/thr_mutex.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/thr_rwlock.cc b/libmysqlclient/mysql/mysys/thr_rwlock.cc
new file mode 120000
index 0000000..f04a455
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/thr_rwlock.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/thr_rwlock.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/tree.cc b/libmysqlclient/mysql/mysys/tree.cc
new file mode 120000
index 0000000..c34b980
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/tree.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/tree.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/typelib.cc b/libmysqlclient/mysql/mysys/typelib.cc
new file mode 120000
index 0000000..c72b6af
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/typelib.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/typelib.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/mysys/win_timers.cc b/libmysqlclient/mysql/mysys/win_timers.cc
new file mode 120000
index 0000000..2c61b10
--- /dev/null
+++ b/libmysqlclient/mysql/mysys/win_timers.cc
@@ -0,0 +1 @@
+../../../upstream/mysys/win_timers.cc
\ No newline at end of file
diff --git a/libmysqlclient/mysql/version.h.in b/libmysqlclient/mysql/version.h.in
index 9c69727..246c217 120000
--- a/libmysqlclient/mysql/version.h.in
+++ b/libmysqlclient/mysql/version.h.in
@@ -1 +1 @@
-mysql/mysql_version.h.in
\ No newline at end of file
+../../upstream/include/mysql_version.h.in
\ No newline at end of file
-- 
cgit v1.1