summaryrefslogtreecommitdiff
path: root/libmysqlclient/mysql
diff options
context:
space:
mode:
Diffstat (limited to 'libmysqlclient/mysql')
-rw-r--r--libmysqlclient/mysql/.gitattributes5
-rw-r--r--libmysqlclient/mysql/buildfile20
-rw-r--r--libmysqlclient/mysql/my_config.h49
l---------libmysqlclient/mysql/mysql1
l---------libmysqlclient/mysql/mysql/add_with_saturate.h1
l---------libmysqlclient/mysql/mysql/base64.h1
l---------libmysqlclient/mysql/mysql/big_endian.h1
l---------libmysqlclient/mysql/mysql/c_string_less.h1
l---------libmysqlclient/mysql/mysql/caching_sha2_passwordopt-longopts.h1
l---------libmysqlclient/mysql/mysql/caching_sha2_passwordopt-vars.h1
l---------libmysqlclient/mysql/mysql/crypt_genhash_impl.h1
l---------libmysqlclient/mysql/mysql/decimal.h1
l---------libmysqlclient/mysql/mysql/depth_first_search.h1
l---------libmysqlclient/mysql/mysql/dur_prop.h1
l---------libmysqlclient/mysql/mysql/errmsg.h1
l---------libmysqlclient/mysql/mysql/ft_global.h1
l---------libmysqlclient/mysql/mysql/heap.h1
l---------libmysqlclient/mysql/mysql/keycache.h1
l---------libmysqlclient/mysql/mysql/lex_string.h1
l---------libmysqlclient/mysql/mysql/lf.h1
l---------libmysqlclient/mysql/mysql/little_endian.h1
-rw-r--r--libmysqlclient/mysql/mysql/m_ctype.h737
l---------libmysqlclient/mysql/mysql/m_ctype.h.orig1
l---------libmysqlclient/mysql/mysql/m_string.h1
l---------libmysqlclient/mysql/mysql/map_helpers.h1
l---------libmysqlclient/mysql/mysql/memory_debugging.h1
l---------libmysqlclient/mysql/mysql/mf_wcomp.h1
l---------libmysqlclient/mysql/mysql/mutex_lock.h1
l---------libmysqlclient/mysql/mysql/my_aes.h1
l---------libmysqlclient/mysql/mysql/my_alloc.h1
l---------libmysqlclient/mysql/mysql/my_atomic.h1
l---------libmysqlclient/mysql/mysql/my_base.h1
l---------libmysqlclient/mysql/mysql/my_basename.h1
l---------libmysqlclient/mysql/mysql/my_bit.h1
l---------libmysqlclient/mysql/mysql/my_bitmap.h1
l---------libmysqlclient/mysql/mysql/my_byteorder.h1
l---------libmysqlclient/mysql/mysql/my_check_opt.h1
l---------libmysqlclient/mysql/mysql/my_command.h1
l---------libmysqlclient/mysql/mysql/my_compare.h1
l---------libmysqlclient/mysql/mysql/my_compiler.h1
l---------libmysqlclient/mysql/mysql/my_dbug.h1
l---------libmysqlclient/mysql/mysql/my_default.h1
-rw-r--r--libmysqlclient/mysql/mysql/my_dir.h98
l---------libmysqlclient/mysql/mysql/my_dir.h.orig1
l---------libmysqlclient/mysql/mysql/my_double2ulonglong.h1
l---------libmysqlclient/mysql/mysql/my_getopt.h1
l---------libmysqlclient/mysql/mysql/my_hash_combine.h1
l---------libmysqlclient/mysql/mysql/my_icp.h1
l---------libmysqlclient/mysql/mysql/my_inttypes.h1
l---------libmysqlclient/mysql/mysql/my_io.h1
l---------libmysqlclient/mysql/mysql/my_list.h1
l---------libmysqlclient/mysql/mysql/my_loglevel.h1
l---------libmysqlclient/mysql/mysql/my_macros.h1
l---------libmysqlclient/mysql/mysql/my_md5.h1
l---------libmysqlclient/mysql/mysql/my_md5_size.h1
l---------libmysqlclient/mysql/mysql/my_murmur3.h1
l---------libmysqlclient/mysql/mysql/my_pointer_arithmetic.h1
l---------libmysqlclient/mysql/mysql/my_psi_config.h1
l---------libmysqlclient/mysql/mysql/my_rapidjson_size_t.h1
l---------libmysqlclient/mysql/mysql/my_rdtsc.h1
l---------libmysqlclient/mysql/mysql/my_rnd.h1
l---------libmysqlclient/mysql/mysql/my_sharedlib.h1
l---------libmysqlclient/mysql/mysql/my_shm_defaults.h1
l---------libmysqlclient/mysql/mysql/my_sqlcommand.h1
l---------libmysqlclient/mysql/mysql/my_stacktrace.h1
l---------libmysqlclient/mysql/mysql/my_sys.h1
l---------libmysqlclient/mysql/mysql/my_systime.h1
l---------libmysqlclient/mysql/mysql/my_table_map.h1
l---------libmysqlclient/mysql/mysql/my_thread.h1
l---------libmysqlclient/mysql/mysql/my_thread_local.h1
l---------libmysqlclient/mysql/mysql/my_thread_os_id.h1
l---------libmysqlclient/mysql/mysql/my_time.h1
l---------libmysqlclient/mysql/mysql/my_timer.h1
l---------libmysqlclient/mysql/mysql/my_tree.h1
l---------libmysqlclient/mysql/mysql/my_uctype.h1
l---------libmysqlclient/mysql/mysql/my_user.h1
l---------libmysqlclient/mysql/mysql/my_xml.h1
l---------libmysqlclient/mysql/mysql/myisam.h1
l---------libmysqlclient/mysql/mysql/myisammrg.h1
l---------libmysqlclient/mysql/mysql/myisampack.h1
l---------libmysqlclient/mysql/mysql/mysql.h1
-rw-r--r--libmysqlclient/mysql/mysql/mysql/.gitattributes1
l---------libmysqlclient/mysql/mysql/mysql/client_authentication.h1
l---------libmysqlclient/mysql/mysql/mysql/client_plugin.h1
l---------libmysqlclient/mysql/mysql/mysql/com_data.h1
l---------libmysqlclient/mysql/mysql/mysql/components/component_implementation.h1
l---------libmysqlclient/mysql/mysql/mysql/components/my_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/service_implementation.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/audit_api_message_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/backup_lock_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/clone_protocol_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/component_status_var_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/component_sys_var_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/dynamic_loader_scheme_file.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/dynamic_privilege.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/group_member_status_listener.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/group_membership_listener.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/host_application_signal.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/log_builtins.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/log_builtins_filter.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/log_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/log_shared.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/my_host_application_signal.h1
-rw-r--r--libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h66
l---------libmysqlclient/mysql/mysql/mysql/components/services/my_io_bits.h.orig1
l---------libmysqlclient/mysql/mysql/mysql/components/services/my_thread_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_cond_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_mutex_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_rwlock_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_socket_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/mysql_string.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/ongoing_transaction_query_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/persistent_dynamic_loader.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/pfs_notification.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/pfs_plugin_table_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/pfs_resource_group.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_cond.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_cond_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_error.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_error_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_error_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_file.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_file_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_file_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_idle.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_idle_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mdl_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_memory.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_memory_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_mutex_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_rwlock_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_socket.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_socket_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_stage.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_stage_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_statement.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_statement_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_system.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_system_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_system_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_table.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_table_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_table_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_thread.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_thread_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/psi_transaction_service.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/registry.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/security_context.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/system_variable_source_type.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/thr_cond_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/thr_mutex_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/thr_rwlock_bits.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/udf_registration.h1
l---------libmysqlclient/mysql/mysql/mysql/components/services/validate_password.h1
l---------libmysqlclient/mysql/mysql/mysql/get_password.h1
l---------libmysqlclient/mysql/mysql/mysql/group_replication_priv.h1
l---------libmysqlclient/mysql/mysql/mysql/innodb_priv.h1
l---------libmysqlclient/mysql/mysql/mysql/mysql_lex_string.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_audit.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_audit_message_types.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_auth.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_auth_common.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_clone.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_ftparser.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_group_replication.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_keyring.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_query_rewrite.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_trace.h1
l---------libmysqlclient/mysql/mysql/mysql/plugin_validate_password.h1
l---------libmysqlclient/mysql/mysql/mysql/psi1
l---------libmysqlclient/mysql/mysql/mysql/service_command.h1
l---------libmysqlclient/mysql/mysql/mysql/service_locking.h1
l---------libmysqlclient/mysql/mysql/mysql/service_my_plugin_log.h1
l---------libmysqlclient/mysql/mysql/mysql/service_mysql_alloc.h1
l---------libmysqlclient/mysql/mysql/mysql/service_mysql_keyring.h1
l---------libmysqlclient/mysql/mysql/mysql/service_mysql_password_policy.h1
l---------libmysqlclient/mysql/mysql/mysql/service_mysql_string.h1
l---------libmysqlclient/mysql/mysql/mysql/service_parser.h1
l---------libmysqlclient/mysql/mysql/mysql/service_plugin_registry.h1
l---------libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_ctx.h1
l---------libmysqlclient/mysql/mysql/mysql/service_rpl_transaction_write_set.h1
l---------libmysqlclient/mysql/mysql/mysql/service_rules_table.h1
l---------libmysqlclient/mysql/mysql/mysql/service_security_context.h1
l---------libmysqlclient/mysql/mysql/mysql/service_srv_session.h1
l---------libmysqlclient/mysql/mysql/mysql/service_srv_session_info.h1
l---------libmysqlclient/mysql/mysql/mysql/service_ssl_wrapper.h1
l---------libmysqlclient/mysql/mysql/mysql/service_thd_alloc.h1
l---------libmysqlclient/mysql/mysql/mysql/service_thd_engine_lock.h1
l---------libmysqlclient/mysql/mysql/mysql/service_thd_wait.h1
l---------libmysqlclient/mysql/mysql/mysql/service_thread_scheduler.h1
l---------libmysqlclient/mysql/mysql/mysql/services.h1
l---------libmysqlclient/mysql/mysql/mysql/status_var.h1
l---------libmysqlclient/mysql/mysql/mysql/thread_pool_priv.h1
l---------libmysqlclient/mysql/mysql/mysql/thread_type.h1
l---------libmysqlclient/mysql/mysql/mysql/udf_registration_types.h1
l---------libmysqlclient/mysql/mysql/mysql_com.h1
l---------libmysqlclient/mysql/mysql/mysql_com_server.h1
l---------libmysqlclient/mysql/mysql/mysql_time.h1
l---------libmysqlclient/mysql/mysql/mysys_err.h1
l---------libmysqlclient/mysql/mysql/nullable.h1
l---------libmysqlclient/mysql/mysql/password.h1
l---------libmysqlclient/mysql/mysql/pfs_cond_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_error_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_file_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_idle_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_memory_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_metadata_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_mutex_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_rwlock_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_socket_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_stage_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_statement_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_system_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_table_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_thread_provider.h1
l---------libmysqlclient/mysql/mysql/pfs_transaction_provider.h1
l---------libmysqlclient/mysql/mysql/prealloced_array.h1
l---------libmysqlclient/mysql/mysql/print_version.h1
l---------libmysqlclient/mysql/mysql/priority_queue.h1
l---------libmysqlclient/mysql/mysql/rwlock_scoped_lock.h1
l---------libmysqlclient/mysql/mysql/scope_guard.h1
l---------libmysqlclient/mysql/mysql/service_versions.h1
l---------libmysqlclient/mysql/mysql/sha1.h1
l---------libmysqlclient/mysql/mysql/sha2.h1
l---------libmysqlclient/mysql/mysql/sql_chars.h1
l---------libmysqlclient/mysql/mysql/sql_common.h1
l---------libmysqlclient/mysql/mysql/sql_string.h1
l---------libmysqlclient/mysql/mysql/sslopt-case.h1
l---------libmysqlclient/mysql/mysql/sslopt-longopts.h1
l---------libmysqlclient/mysql/mysql/sslopt-vars.h1
l---------libmysqlclient/mysql/mysql/template_utils.h1
l---------libmysqlclient/mysql/mysql/thr_cond.h1
l---------libmysqlclient/mysql/mysql/thr_lock.h1
l---------libmysqlclient/mysql/mysql/thr_mutex.h1
l---------libmysqlclient/mysql/mysql/thr_rwlock.h1
l---------libmysqlclient/mysql/mysql/typelib.h1
l---------libmysqlclient/mysql/mysql/unsafe_string_append.h1
l---------libmysqlclient/mysql/mysql/varlen_sort.h1
l---------libmysqlclient/mysql/mysql/violite.h1
l---------libmysqlclient/mysql/mysql/welcome_copyright_notice.h1
l---------libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution.h1
l---------libmysqlclient/mysql/mysql/wolfssl_fix_namespace_pollution_pre.h1
l---------libmysqlclient/mysql/mysys1
l---------libmysqlclient/mysql/mysys/array.cc1
l---------libmysqlclient/mysql/mysys/base64.cc1
l---------libmysqlclient/mysql/mysys/charset-def.cc1
l---------libmysqlclient/mysql/mysys/charset.cc1
l---------libmysqlclient/mysql/mysys/checksum.cc1
l---------libmysqlclient/mysql/mysys/errors.cc1
l---------libmysqlclient/mysql/mysys/kqueue_timers.cc1
l---------libmysqlclient/mysql/mysys/lf_alloc-pin.cc1
l---------libmysqlclient/mysql/mysys/lf_dynarray.cc1
l---------libmysqlclient/mysql/mysys/lf_hash.cc1
l---------libmysqlclient/mysql/mysys/list.cc1
l---------libmysqlclient/mysql/mysys/mf_arr_appstr.cc1
l---------libmysqlclient/mysql/mysys/mf_cache.cc1
l---------libmysqlclient/mysql/mysys/mf_dirname.cc1
l---------libmysqlclient/mysql/mysys/mf_fn_ext.cc1
l---------libmysqlclient/mysql/mysys/mf_format.cc1
l---------libmysqlclient/mysql/mysys/mf_getdate.cc1
l---------libmysqlclient/mysql/mysys/mf_iocache.cc1
l---------libmysqlclient/mysql/mysys/mf_iocache2.cc1
l---------libmysqlclient/mysql/mysys/mf_keycache.cc1
l---------libmysqlclient/mysql/mysys/mf_keycaches.cc1
l---------libmysqlclient/mysql/mysys/mf_loadpath.cc1
l---------libmysqlclient/mysql/mysys/mf_pack.cc1
l---------libmysqlclient/mysql/mysys/mf_path.cc1
l---------libmysqlclient/mysql/mysys/mf_qsort2.cc1
l---------libmysqlclient/mysql/mysys/mf_same.cc1
l---------libmysqlclient/mysql/mysys/mf_tempdir.cc1
l---------libmysqlclient/mysql/mysys/mf_tempfile.cc1
l---------libmysqlclient/mysql/mysys/mf_unixpath.cc1
l---------libmysqlclient/mysql/mysys/mf_wcomp.cc1
l---------libmysqlclient/mysql/mysys/mulalloc.cc1
l---------libmysqlclient/mysql/mysys/my_access.cc1
l---------libmysqlclient/mysql/mysys/my_alloc.cc1
l---------libmysqlclient/mysql/mysys/my_bit.cc1
l---------libmysqlclient/mysql/mysys/my_bitmap.cc1
l---------libmysqlclient/mysql/mysys/my_chmod.cc1
l---------libmysqlclient/mysql/mysys/my_chsize.cc1
l---------libmysqlclient/mysql/mysys/my_compare.cc1
l---------libmysqlclient/mysql/mysys/my_compress.cc1
l---------libmysqlclient/mysql/mysys/my_conio.cc1
l---------libmysqlclient/mysql/mysys/my_copy.cc1
l---------libmysqlclient/mysql/mysys/my_create.cc1
l---------libmysqlclient/mysql/mysys/my_delete.cc1
l---------libmysqlclient/mysql/mysys/my_div.cc1
l---------libmysqlclient/mysql/mysys/my_error.cc1
l---------libmysqlclient/mysql/mysys/my_fallocator.cc1
l---------libmysqlclient/mysql/mysys/my_file.cc1
l---------libmysqlclient/mysql/mysys/my_fopen.cc1
l---------libmysqlclient/mysql/mysys/my_fstream.cc1
l---------libmysqlclient/mysql/mysys/my_gethwaddr.cc1
l---------libmysqlclient/mysql/mysys/my_getsystime.cc1
l---------libmysqlclient/mysql/mysys/my_getwd.cc1
l---------libmysqlclient/mysql/mysys/my_handler_errors.h1
l---------libmysqlclient/mysql/mysys/my_init.cc1
l---------libmysqlclient/mysql/mysys/my_largepage.cc1
l---------libmysqlclient/mysql/mysys/my_lib.cc1
l---------libmysqlclient/mysql/mysys/my_malloc.cc1
l---------libmysqlclient/mysql/mysys/my_mess.cc1
l---------libmysqlclient/mysql/mysys/my_mkdir.cc1
l---------libmysqlclient/mysql/mysys/my_mmap.cc1
l---------libmysqlclient/mysql/mysys/my_murmur3.cc1
l---------libmysqlclient/mysql/mysys/my_once.cc1
l---------libmysqlclient/mysql/mysys/my_open.cc1
l---------libmysqlclient/mysql/mysys/my_pread.cc1
l---------libmysqlclient/mysql/mysys/my_rdtsc.cc1
l---------libmysqlclient/mysql/mysys/my_read.cc1
l---------libmysqlclient/mysql/mysys/my_rename.cc1
l---------libmysqlclient/mysql/mysys/my_seek.cc1
l---------libmysqlclient/mysql/mysys/my_static.cc1
l---------libmysqlclient/mysql/mysys/my_static.h1
l---------libmysqlclient/mysql/mysys/my_string.cc1
l---------libmysqlclient/mysql/mysys/my_symlink.cc1
l---------libmysqlclient/mysql/mysys/my_symlink2.cc1
l---------libmysqlclient/mysql/mysys/my_sync.cc1
l---------libmysqlclient/mysql/mysys/my_syslog.cc1
-rw-r--r--libmysqlclient/mysql/mysys/my_thr_init.cc385
l---------libmysqlclient/mysql/mysys/my_thr_init.cc.orig1
l---------libmysqlclient/mysql/mysys/my_thread.cc1
l---------libmysqlclient/mysql/mysys/my_time.cc1
l---------libmysqlclient/mysql/mysys/my_timespec.cc1
l---------libmysqlclient/mysql/mysys/my_user.cc1
l---------libmysqlclient/mysql/mysys/my_windac.cc1
l---------libmysqlclient/mysql/mysys/my_winerr.cc1
l---------libmysqlclient/mysql/mysys/my_winfile.cc1
l---------libmysqlclient/mysql/mysys/my_write.cc1
l---------libmysqlclient/mysql/mysys/mysys_priv.h1
l---------libmysqlclient/mysql/mysys/pack.cc1
l---------libmysqlclient/mysql/mysys/posix_timers.cc1
l---------libmysqlclient/mysql/mysys/print_version.cc1
l---------libmysqlclient/mysql/mysys/psi_noop.cc1
l---------libmysqlclient/mysql/mysys/ptr_cmp.cc1
l---------libmysqlclient/mysql/mysys/sql_chars.cc1
-rw-r--r--libmysqlclient/mysql/mysys/stacktrace.cc784
l---------libmysqlclient/mysql/mysys/stacktrace.cc.orig1
l---------libmysqlclient/mysql/mysys/thr_cond.cc1
l---------libmysqlclient/mysql/mysys/thr_lock.cc1
l---------libmysqlclient/mysql/mysys/thr_mutex.cc1
l---------libmysqlclient/mysql/mysys/thr_rwlock.cc1
l---------libmysqlclient/mysql/mysys/tree.cc1
l---------libmysqlclient/mysql/mysys/typelib.cc1
l---------libmysqlclient/mysql/mysys/win_timers.cc1
l---------libmysqlclient/mysql/sql-common1
l---------libmysqlclient/mysql/sql-common/client.cc1
l---------libmysqlclient/mysql/sql-common/client_authentication.cc1
l---------libmysqlclient/mysql/sql-common/client_plugin.cc1
l---------libmysqlclient/mysql/sql-common/get_password.cc1
l---------libmysqlclient/mysql/sql-common/my_path_permissions.cc1
l---------libmysqlclient/mysql/sql-common/net_serv.cc1
-rw-r--r--libmysqlclient/mysql/sql-common/sql_string.cc1254
l---------libmysqlclient/mysql/sql-common/sql_string.cc.orig1
l---------libmysqlclient/mysql/strings1
l---------libmysqlclient/mysql/strings/README1
l---------libmysqlclient/mysql/strings/conf_to_src.cc1
l---------libmysqlclient/mysql/strings/ctype-big5.cc1
l---------libmysqlclient/mysql/strings/ctype-bin.cc1
l---------libmysqlclient/mysql/strings/ctype-cp932.cc1
-rw-r--r--libmysqlclient/mysql/strings/ctype-czech.cc699
l---------libmysqlclient/mysql/strings/ctype-czech.cc.orig1
l---------libmysqlclient/mysql/strings/ctype-euc_kr.cc1
l---------libmysqlclient/mysql/strings/ctype-eucjpms.cc1
l---------libmysqlclient/mysql/strings/ctype-extra.cc1
l---------libmysqlclient/mysql/strings/ctype-gb18030.cc1
l---------libmysqlclient/mysql/strings/ctype-gb2312.cc1
l---------libmysqlclient/mysql/strings/ctype-gbk.cc1
l---------libmysqlclient/mysql/strings/ctype-latin1.cc1
l---------libmysqlclient/mysql/strings/ctype-mb.cc1
l---------libmysqlclient/mysql/strings/ctype-simple.cc1
l---------libmysqlclient/mysql/strings/ctype-sjis.cc1
l---------libmysqlclient/mysql/strings/ctype-tis620.cc1
l---------libmysqlclient/mysql/strings/ctype-uca.cc1
l---------libmysqlclient/mysql/strings/ctype-ucs2.cc1
l---------libmysqlclient/mysql/strings/ctype-ujis.cc1
l---------libmysqlclient/mysql/strings/ctype-utf8.cc1
l---------libmysqlclient/mysql/strings/ctype-win1250ch.cc1
l---------libmysqlclient/mysql/strings/ctype.cc1
-rw-r--r--libmysqlclient/mysql/strings/decimal.cc2482
l---------libmysqlclient/mysql/strings/decimal.cc.orig1
l---------libmysqlclient/mysql/strings/do_ctype.cc1
l---------libmysqlclient/mysql/strings/dtoa.cc1
l---------libmysqlclient/mysql/strings/dump_map.cc1
l---------libmysqlclient/mysql/strings/int2str.cc1
l---------libmysqlclient/mysql/strings/longlong2str.cc1
l---------libmysqlclient/mysql/strings/mb_wc.h1
l---------libmysqlclient/mysql/strings/my_strchr.cc1
l---------libmysqlclient/mysql/strings/my_strtoll10.cc1
l---------libmysqlclient/mysql/strings/str2int.cc1
l---------libmysqlclient/mysql/strings/str_alloc.cc1
l---------libmysqlclient/mysql/strings/str_uca_type.h1
l---------libmysqlclient/mysql/strings/strcont.cc1
l---------libmysqlclient/mysql/strings/strmake.cc1
l---------libmysqlclient/mysql/strings/strxmov.cc1
l---------libmysqlclient/mysql/strings/strxnmov.cc1
l---------libmysqlclient/mysql/strings/t_ctype.h1
l---------libmysqlclient/mysql/strings/uca-dump.cc1
l---------libmysqlclient/mysql/strings/uca9-dump.cc1
l---------libmysqlclient/mysql/strings/uca900_data.h1
l---------libmysqlclient/mysql/strings/uca900_ja_data.h1
l---------libmysqlclient/mysql/strings/uca_data.h1
l---------libmysqlclient/mysql/strings/uctypedump.cc1
l---------libmysqlclient/mysql/strings/utr11-dump.cc1
l---------libmysqlclient/mysql/strings/xml.cc1
l---------libmysqlclient/mysql/version.h.in1
430 files changed, 6970 insertions, 28 deletions
diff --git a/libmysqlclient/mysql/.gitattributes b/libmysqlclient/mysql/.gitattributes
new file mode 100644
index 0000000..e728b61
--- /dev/null
+++ b/libmysqlclient/mysql/.gitattributes
@@ -0,0 +1,5 @@
+libbinlogevents symlink=dir
+libmysql symlink=dir
+mysys_ssl symlink=dir
+sql symlink=dir
+vio symlink=dir
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile
index cea8d4c..d9273bf 100644
--- a/libmysqlclient/mysql/buildfile
+++ b/libmysqlclient/mysql/buildfile
@@ -37,9 +37,7 @@ lib{mysqlclient}: {h c }{* -version -config} \
sql/auth/{ hxx }{* } \
sql/auth/{ cxx}{password sha2_password_common} \
sql-common/{ hxx cxx}{* } \
- libmysql/{ hxx cxx}{* -*test*} \
- { def}{libmysql_exports } \
- $imp_libs
+ libmysql/{ hxx cxx}{* -*test*}
lib{mysqlclient}: mysys/cxx{posix_timers}: include = $linux
lib{mysqlclient}: mysys/cxx{kqueue_timers}: include = ($bsd || $macos)
@@ -48,6 +46,10 @@ lib{mysqlclient}: mysys/{ cxx}{$mysys_win32} \
vio/{ cxx}{$vio_win32 } \
libmysql/authentication_win/{hxx cxx}{* }: include = $windows
+lib{mysqlclient}: $imp_libs
+
+libs{mysqlclient}: def{libmysql_exports}: include = $windows
+
# Makes sense to distribute READMEs for the bundled libraries. Note that their
# licenses are incorporated into the root LICENSE file.
#
@@ -65,7 +67,7 @@ lib{mysqlclient}: strings/file{README}
# Fedora/RHEL: /var/lib/mysql/mysql.sock
# Source package: /tmp/mysql.sock
#
-h{version}: mysql/in{mysql_version} $src_root/manifest
+h{version}: in{version} $src_root/manifest
{
dist = true
clean = ($src_root != $out_root)
@@ -214,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'
{
@@ -229,14 +231,14 @@ switch $tclass, $tsys
#
cc.loptions += -Wl,--no-undefined
- cc.libs += -ldl -lpthread -lm -lrt
+ cc.libs += -ldl -lm -lrt -pthread
}
case 'bsd'
- cc.libs += -lexecinfo -lpthread -lm
+ cc.libs += -lexecinfo -lm -pthread
default
- cc.libs += -ldl -lpthread -lm
+ cc.libs += -ldl -lm -pthread
}
# Export options.
diff --git a/libmysqlclient/mysql/my_config.h b/libmysqlclient/mysql/my_config.h
index e13079b..7914fcf 100644
--- a/libmysqlclient/mysql/my_config.h
+++ b/libmysqlclient/mysql/my_config.h
@@ -17,14 +17,15 @@
*/
/*
- * Auto-generated. Defines the following configuration macros:
+ * Includes auto-generated version.h. Defines the following configuration
+ * macros:
#define PROTOCOL_VERSION
* Keep all the macros listed (in this exact form) for the change tracking
* (see README-DEV).
*/
-#include <mysql/version.h> // PROTOCOL_VERSION, MYSQL_SERVER_VERSION
+#include <mysql/mysql_version.h> // PROTOCOL_VERSION, MYSQL_SERVER_VERSION
/*
* Auto-generated. Defines macros that depend on the version and build2
@@ -108,15 +109,24 @@
# define SIZEOF_CHARP SIZEOF_VOIDP
#endif
-#define HAVE_STRUCT_TIMESPEC
-
/*
* Hard to even find any records of these types.
*/
-#undef HAVE_UINT
#undef HAVE_ULONG
/*
+ * GNU libc added strlcpy() and strlcat() in version 2.38 (in anticipation
+ * of their addition to POSIX).
+ */
+#if defined(__FreeBSD__) || \
+ defined(__APPLE__) || \
+ (defined(__GLIBC__) && \
+ defined(__GLIBC_MINOR__) && \
+ (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 38))
+# define HAVE_STRLCAT 1
+#endif
+
+/*
* Specific for Linux.
*/
#ifdef __linux__
@@ -168,7 +178,6 @@
#if defined(__FreeBSD__) || defined(__linux__)
# define HAVE_CLOCK_GETTIME 1
# define HAVE_CUSERID 1
-# define HAVE_SIGEV_THREAD_ID 1
# define HAVE_POSIX_FALLOCATE 1
#endif
@@ -181,7 +190,6 @@
# define HAVE_KQUEUE_TIMERS 1
# define HAVE_SOCKADDR_IN_SIN_LEN 1
# define HAVE_SOCKADDR_IN6_SIN6_LEN 1
-# define HAVE_STRLCAT 1
#endif
/*
@@ -210,8 +218,6 @@
# define HAVE_GETPWUID 1
# define HAVE_GETRLIMIT 1
# define HAVE_GETRUSAGE 1
-# define HAVE_READLINK 1
-# define HAVE_REALPATH 1
# define HAVE_STPCPY 1
# define HAVE_STPNCPY 1
# define HAVE_NL_LANGINFO 1
@@ -223,7 +229,6 @@
# define TIME_WITH_SYS_TIME 1
# define HAVE_ARPA_INET_H 1
# define HAVE_NETINET_IN_H 1
-# define HAVE_CHOWN 1
# define HAVE_FCHMOD 1
# define HAVE_MLOCKALL 1
# define HAVE_SYS_WAIT_H 1
@@ -247,6 +252,18 @@
# define HAVE_BUILTIN_STPCPY 1
/*
+ * Libedit.
+ */
+# define USE_LIBEDIT_INTERFACE 1
+# define USE_NEW_EDITLINE_INTERFACE 1
+# define HAVE_HIST_ENTRY 1
+# undef HAVE_TERM_H
+
+# define GWINSZ_IN_SYS_IOCTL 1
+# define HAVE_INDEX 1
+# define HAVE_INITGROUPS 1
+
+/*
* Specific for Windows.
*/
#else
@@ -254,6 +271,7 @@
# define HAVE_TELL 1
# define NO_FCNTL_NONBLOCK 1
# define DEFAULT_TMPDIR ""
+# define FN_NO_CASE_SENSE 1
#endif
#ifdef _WIN32
@@ -267,10 +285,11 @@
/*
* Common for all supported OSes/compilers.
*/
-#define HAVE_STRNLEN 1
-#define MAX_INDEXES 64U
-#define HAVE_SYS_TYPES_H 1
-#define STACK_DIRECTION -1
+#define MAX_INDEXES 64U
+#define HAVE_SYS_TYPES_H 1
+#define STACK_DIRECTION -1
+#define CPU_LEVEL1_DCACHE_LINESIZE 64
+#define DEFAULT_SECURE_FILE_PRIV_DIR "NULL"
/*
* Default character set and collation.
@@ -307,8 +326,8 @@
#undef HAVE_PRINTSTACK
#undef HAVE_GETHRTIME
#undef HAVE_GETPASSPHRASE
-#undef HAVE_SIGEV_PORT
#undef HAVE_SOLARIS_ATOMIC
+#undef LINUX_ALPINE
/*
* The upstream package undefines it for all supported compilers.
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/sql-common b/libmysqlclient/mysql/sql-common
deleted file mode 120000
index 422c9c7..0000000
--- a/libmysqlclient/mysql/sql-common
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/sql-common \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/client.cc b/libmysqlclient/mysql/sql-common/client.cc
new file mode 120000
index 0000000..df85e94
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/client.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/client.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/client_authentication.cc b/libmysqlclient/mysql/sql-common/client_authentication.cc
new file mode 120000
index 0000000..90e7670
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/client_authentication.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/client_authentication.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/client_plugin.cc b/libmysqlclient/mysql/sql-common/client_plugin.cc
new file mode 120000
index 0000000..f80c44e
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/client_plugin.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/client_plugin.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/get_password.cc b/libmysqlclient/mysql/sql-common/get_password.cc
new file mode 120000
index 0000000..934324b
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/get_password.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/get_password.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/my_path_permissions.cc b/libmysqlclient/mysql/sql-common/my_path_permissions.cc
new file mode 120000
index 0000000..f0cc1d4
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/my_path_permissions.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/my_path_permissions.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/net_serv.cc b/libmysqlclient/mysql/sql-common/net_serv.cc
new file mode 120000
index 0000000..0a6d83c
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/net_serv.cc
@@ -0,0 +1 @@
+../../../upstream/sql-common/net_serv.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/sql-common/sql_string.cc b/libmysqlclient/mysql/sql-common/sql_string.cc
new file mode 100644
index 0000000..8efa97a
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/sql_string.cc
@@ -0,0 +1,1254 @@
+/* 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 */
+
+#include "sql_string.h"
+
+#include <limits>
+#include <algorithm>
+
+#include "my_dbug.h"
+#include "my_macros.h"
+#include "my_pointer_arithmetic.h"
+#include "my_sys.h"
+#include "mysql_com.h" // MAX_BIGINT_WIDTH
+
+using std::max;
+using std::min;
+
+#ifdef MYSQL_SERVER
+PSI_memory_key key_memory_String_value;
+#endif
+
+/*****************************************************************************
+** String functions
+*****************************************************************************/
+
+bool String::real_alloc(size_t length) {
+ size_t arg_length = ALIGN_SIZE(length + 1);
+ DBUG_ASSERT(arg_length > length);
+ if (arg_length <= length) return true; /* Overflow */
+ m_length = 0;
+ if (m_alloced_length < arg_length) {
+ mem_free();
+ if (!(m_ptr = static_cast<char *>(
+ my_malloc(STRING_PSI_MEMORY_KEY, arg_length, MYF(MY_WME)))))
+ return true;
+ m_alloced_length = static_cast<uint32>(arg_length);
+ m_is_alloced = true;
+ }
+ m_ptr[0] = 0;
+ return false;
+}
+
+/**
+ Allocates a new buffer on the heap for this String.
+
+ - If the String's internal buffer is privately owned and heap allocated,
+ one of the following is performed.
+
+ - If the requested length is greater than what fits in the buffer, a new
+ buffer is allocated, data moved and the old buffer freed.
+
+ - If the requested length is less or equal to what fits in the buffer, a
+ null character is inserted at the appropriate position.
+
+ - If the String does not keep a private buffer on the heap:
+
+ - If the requested length is greater than what fits in the buffer, or
+ force_on_heap is true, a new buffer is allocated, data is copied.
+ - If the requested length is less or equal to what fits in the buffer,
+ and force_on_heap is false, a null character is inserted at the
+ appropriate position.
+
+ For C compatibility, the new string buffer is null terminated.
+
+ @param alloc_length The requested string size in characters, excluding any
+ null terminator.
+ @param force_on_heap If the caller wants String's 'str' buffer to be on the
+ heap in all cases.
+
+ @retval false Either the copy operation is complete or, if the size of the
+ new buffer is smaller than the currently allocated buffer (if one exists),
+ no allocation occured.
+
+ @retval true An error occured when attempting to allocate memory or memory
+ allocation length exceeded allowed limit (4GB) for String Class.
+*/
+bool String::mem_realloc(size_t alloc_length, bool force_on_heap) {
+ size_t len = ALIGN_SIZE(alloc_length + 1);
+ DBUG_ASSERT(len > alloc_length);
+ if (len <= alloc_length) return true; /* Overflow */
+
+ if (force_on_heap && !m_is_alloced) {
+ /*
+ Caller wants bytes on the heap, and the currently available bytes are
+ not; they are thus irrelevant:
+ */
+ m_alloced_length = 0;
+ }
+
+ if (m_alloced_length < len) { // Available bytes are not enough
+ // Signal an error if len exceeds uint32 max on 64-bit word platform.
+#if defined(__WORDSIZE) && (__WORDSIZE == 64)
+ if (len > std::numeric_limits<uint32>::max()) return true;
+#endif
+ char *new_ptr;
+ if (m_is_alloced) {
+ if (!(new_ptr = static_cast<char *>(
+ my_realloc(STRING_PSI_MEMORY_KEY, m_ptr, len, MYF(MY_WME)))))
+ return true; // Signal error
+ } else if ((new_ptr = static_cast<char *>(
+ my_malloc(STRING_PSI_MEMORY_KEY, len, MYF(MY_WME))))) {
+ if (m_length > len - 1) m_length = 0;
+ if (m_length > 0) memcpy(new_ptr, m_ptr, m_length);
+ new_ptr[m_length] = 0;
+ m_is_alloced = true;
+ } else
+ return true; // Signal error
+ m_ptr = new_ptr;
+ m_alloced_length = static_cast<uint32>(len);
+ }
+ m_ptr[alloc_length] = 0; // This make other funcs shorter
+ return false;
+}
+
+/*
+ Helper function for @see mem_realloc_exp.
+ */
+inline size_t String::next_realloc_exp_size(size_t sz) {
+ const size_t len = ALIGN_SIZE(sz + 1);
+ const size_t ret =
+ (m_is_alloced && m_alloced_length < len) ? sz + (m_length / 4) : sz;
+ return ret;
+}
+
+/**
+ This function is used by the various append() member functions, to ensure
+ that append() has amortized constant cost. Once we have started to allocate
+ buffer on the heap, we increase the buffer size exponentially, rather
+ than linearly.
+
+ @param alloc_length The requested string size in characters, excluding any
+ null terminator.
+
+ @retval false Either the copy operation is complete or, if the size of the
+ new buffer is smaller than the currently allocated buffer (if one exists),
+ no allocation occured.
+
+ @retval true An error occured when attempting to allocate memory.
+
+ @see mem_realloc.
+ */
+bool String::mem_realloc_exp(size_t alloc_length) {
+ if (mem_realloc(next_realloc_exp_size(alloc_length))) return true;
+ m_ptr[alloc_length] = '\0';
+ return false;
+}
+
+bool String::set_int(longlong num, bool unsigned_flag, const CHARSET_INFO *cs) {
+ uint l = 20 * cs->mbmaxlen + 1;
+ int base = unsigned_flag ? 10 : -10;
+
+ if (alloc(l)) return true;
+ m_length = (uint32)(cs->cset->longlong10_to_str)(cs, m_ptr, l, base, num);
+ m_charset = cs;
+ return false;
+}
+
+bool String::set_real(double num, uint decimals, const CHARSET_INFO *cs) {
+ char buff[FLOATING_POINT_BUFFER];
+ uint dummy_errors;
+ size_t len;
+
+ m_charset = cs;
+ if (decimals >= NOT_FIXED_DEC) {
+ len = my_gcvt(num, MY_GCVT_ARG_DOUBLE, static_cast<int>(sizeof(buff)) - 1,
+ buff, NULL);
+ return copy(buff, len, &my_charset_latin1, cs, &dummy_errors);
+ }
+ len = my_fcvt(num, decimals, buff, NULL);
+ return copy(buff, len, &my_charset_latin1, cs, &dummy_errors);
+}
+
+bool String::copy() {
+ if (!m_is_alloced) {
+ m_alloced_length = 0; // Force realloc
+ return mem_realloc(m_length);
+ }
+ return false;
+}
+
+/**
+ Copies the internal buffer from str. If this String has a private heap
+ allocated buffer where new data does not fit, a new buffer is allocated
+ before copying and the old buffer freed. Character set information is also
+ copied.
+
+ If str is the same as this and str doesn't own its buffer, a
+ new buffer is allocated and it's owned by str.
+
+ @param str The string whose internal buffer is to be copied.
+
+ @retval false Success.
+ @retval true Memory allocation failed.
+*/
+bool String::copy(const String &str) {
+ /*
+ If &str == this and it owns the buffer, this operation is a no-op, so skip
+ the meaningless copy. Otherwise if we do, we will read freed memory at
+ the memmove call below.
+ */
+ if (&str == this && str.is_alloced()) return false;
+
+ /*
+ If a String s doesn't own its buffer, here we should allocate
+ a new buffer owned by s and copy the contents there. But alloc()
+ will change this->m_ptr and this->m_length, and if this == &str, this
+ will also change str->m_ptr and str->m_length, so we need to save
+ these values first.
+ */
+ const size_t str_length = str.m_length;
+ const char *str_ptr = str.m_ptr;
+ if (alloc(str.m_length)) return true;
+ m_length = str_length;
+ if (m_length > 0) memmove(m_ptr, str_ptr, m_length); // May be overlapping
+ m_ptr[m_length] = 0;
+ m_charset = str.m_charset;
+ return false;
+}
+
+bool String::copy(const char *str, size_t arg_length, const CHARSET_INFO *cs) {
+ if (alloc(arg_length)) return true;
+ if ((m_length = arg_length)) memcpy(m_ptr, str, arg_length);
+ m_ptr[arg_length] = 0;
+ m_charset = cs;
+ return false;
+}
+
+/*
+ Checks that the source string can be just copied to the destination string
+ without conversion.
+
+ SYNPOSIS
+
+ needs_conversion()
+ arg_length Length of string to copy.
+ from_cs Character set to copy from
+ to_cs Character set to copy to
+ uint32 *offset Returns number of unaligned characters.
+
+ RETURN
+ 0 No conversion needed
+ 1 Either character set conversion or adding leading zeros
+ (e.g. for UCS-2) must be done
+
+ NOTE
+ to_cs may be NULL for "no conversion" if the system variable
+ character_set_results is NULL.
+*/
+
+bool String::needs_conversion(size_t arg_length, const CHARSET_INFO *from_cs,
+ const CHARSET_INFO *to_cs, size_t *offset) {
+ *offset = 0;
+ if (!to_cs || (to_cs == &my_charset_bin) || (to_cs == from_cs) ||
+ my_charset_same(from_cs, to_cs) ||
+ ((from_cs == &my_charset_bin) &&
+ (!(*offset = (arg_length % to_cs->mbminlen)))))
+ return false;
+ return true;
+}
+
+/*
+ Checks that the source string can just be copied to the destination string
+ without conversion.
+ Unlike needs_conversion it will require conversion on incoming binary data
+ to ensure the data are verified for vailidity first.
+
+ @param arg_length Length of string to copy.
+ @param from_cs Character set to copy from
+ @param to_cs Character set to copy to
+
+ @return conversion needed
+*/
+bool String::needs_conversion_on_storage(size_t arg_length,
+ const CHARSET_INFO *cs_from,
+ const CHARSET_INFO *cs_to) {
+ size_t offset;
+ return (needs_conversion(arg_length, cs_from, cs_to, &offset) ||
+ /* force conversion when storing a binary string */
+ (cs_from == &my_charset_bin &&
+ /* into a non-binary destination */
+ cs_to != &my_charset_bin &&
+ /* and any of the following is true :*/
+ (
+ /* it's a variable length encoding */
+ cs_to->mbminlen != cs_to->mbmaxlen ||
+ /* longer than 2 bytes : neither 1 byte nor ucs2 */
+ cs_to->mbminlen > 2 ||
+ /* and is not a multiple of the char byte size */
+ 0 != (arg_length % cs_to->mbmaxlen))));
+}
+
+/*
+ Copy a multi-byte character sets with adding leading zeros.
+
+ SYNOPSIS
+
+ copy_aligned()
+ str String to copy
+ arg_length Length of string. This should NOT be dividable with
+ cs->mbminlen.
+ offset arg_length % cs->mb_minlength
+ cs Character set for 'str'
+
+ NOTES
+ For real multi-byte, ascii incompatible charactser sets,
+ like UCS-2, add leading zeros if we have an incomplete character.
+ Thus,
+ SELECT _ucs2 0xAA
+ will automatically be converted into
+ SELECT _ucs2 0x00AA
+
+ RETURN
+ 0 ok
+ 1 error
+*/
+
+bool String::copy_aligned(const char *str, size_t arg_length, size_t offset,
+ const CHARSET_INFO *cs) {
+ /* How many bytes are in incomplete character */
+ offset = cs->mbminlen - offset; /* How many zeros we should prepend */
+ DBUG_ASSERT(offset && offset != cs->mbminlen);
+
+ size_t aligned_length = arg_length + offset;
+ if (alloc(aligned_length)) return true;
+
+ /*
+ Note, this is only safe for big-endian UCS-2.
+ If we add little-endian UCS-2 sometimes, this code
+ will be more complicated. But it's OK for now.
+ */
+ memset(m_ptr, 0, offset);
+ memcpy(m_ptr + offset, str, arg_length);
+ m_ptr[aligned_length] = 0;
+ /* m_length is always >= 0 as arg_length is != 0 */
+ m_length = aligned_length;
+ m_charset = cs;
+ return false;
+}
+
+bool String::set_or_copy_aligned(const char *str, size_t arg_length,
+ const CHARSET_INFO *cs) {
+ /* How many bytes are in incomplete character */
+ size_t offset = (arg_length % cs->mbminlen);
+
+ if (!offset) /* All characters are complete, just copy */
+ {
+ set(str, arg_length, cs);
+ return false;
+ }
+ return copy_aligned(str, arg_length, offset, cs);
+}
+
+/**
+ Copies the character data into this String, with optional character set
+ conversion.
+
+ @return
+ false ok
+ true Could not allocate result buffer
+
+*/
+
+bool String::copy(const char *str, size_t arg_length,
+ const CHARSET_INFO *from_cs, const CHARSET_INFO *to_cs,
+ uint *errors) {
+ size_t offset;
+
+ DBUG_ASSERT(!str || str != m_ptr);
+
+ if (!needs_conversion(arg_length, from_cs, to_cs, &offset)) {
+ *errors = 0;
+ return copy(str, arg_length, to_cs);
+ }
+ if ((from_cs == &my_charset_bin) && offset) {
+ *errors = 0;
+ return copy_aligned(str, arg_length, offset, to_cs);
+ }
+ size_t new_length = to_cs->mbmaxlen * arg_length;
+ if (alloc(new_length)) return true;
+ m_length = copy_and_convert(m_ptr, new_length, to_cs, str, arg_length,
+ from_cs, errors);
+ m_charset = to_cs;
+ return false;
+}
+
+/*
+ Set a string to the value of a latin1-string, keeping the original charset
+
+ SYNOPSIS
+ copy_or_set()
+ str String of a simple charset (latin1)
+ arg_length Length of string
+
+ IMPLEMENTATION
+ If string object is of a simple character set, set it to point to the
+ given string.
+ If not, make a copy and convert it to the new character set.
+
+ RETURN
+ 0 ok
+ 1 Could not allocate result buffer
+
+*/
+
+bool String::set_ascii(const char *str, size_t arg_length) {
+ if (m_charset->mbminlen == 1) {
+ set(str, arg_length, m_charset);
+ return 0;
+ }
+ uint dummy_errors;
+ return copy(str, arg_length, &my_charset_latin1, m_charset, &dummy_errors);
+}
+
+/* This is used by mysql.cc */
+
+bool String::fill(size_t max_length, char fill_char) {
+ if (m_length > max_length)
+ m_ptr[m_length = max_length] = 0;
+ else {
+ if (mem_realloc(max_length)) return true;
+ memset(m_ptr + m_length, fill_char, max_length - m_length);
+ m_length = max_length;
+ }
+ return false;
+}
+
+void String::strip_sp() {
+ while (m_length && my_isspace(m_charset, m_ptr[m_length - 1])) m_length--;
+}
+
+bool String::append(const String &s) {
+ if (s.length()) {
+ DBUG_ASSERT(!this->uses_buffer_owned_by(&s));
+ DBUG_ASSERT(!s.uses_buffer_owned_by(this));
+
+ if (mem_realloc_exp((m_length + s.length()))) return true;
+ memcpy(m_ptr + m_length, s.ptr(), s.length());
+ m_length += s.length();
+ }
+ return false;
+}
+
+/*
+ Append an ASCII string to the a string of the current character set
+*/
+
+bool String::append(const char *s, size_t arg_length) {
+ if (!arg_length) return false;
+
+ /*
+ For an ASCII incompatible string, e.g. UCS-2, we need to convert
+ */
+ if (m_charset->mbminlen > 1) {
+ size_t add_length = arg_length * m_charset->mbmaxlen;
+ uint dummy_errors;
+ if (mem_realloc(m_length + add_length)) return true;
+ m_length += copy_and_convert(m_ptr + m_length, add_length, m_charset, s,
+ arg_length, &my_charset_latin1, &dummy_errors);
+ return false;
+ }
+
+ /*
+ For an ASCII compatinble string we can just append.
+ */
+ if (mem_realloc_exp(m_length + arg_length)) return true;
+ memcpy(m_ptr + m_length, s, arg_length);
+ m_length += arg_length;
+ return false;
+}
+
+/*
+ Append a 0-terminated ASCII string
+*/
+
+bool String::append(const char *s) { return append(s, (uint)strlen(s)); }
+
+/**
+ Append an unsigned longlong to the string.
+*/
+bool String::append_ulonglong(ulonglong val) {
+ if (mem_realloc_exp(m_length + MAX_BIGINT_WIDTH + 2)) return true;
+ char *end = longlong10_to_str(val, m_ptr + m_length, 10);
+ m_length = end - m_ptr;
+ return false;
+}
+
+/**
+ Append a signed longlong to the string.
+*/
+bool String::append_longlong(longlong val) {
+ if (mem_realloc_exp(m_length + MAX_BIGINT_WIDTH + 2))
+ return true; /* purecov: inspected */
+ char *end = longlong10_to_str(val, m_ptr + m_length, -10);
+ m_length = end - m_ptr;
+ return false;
+}
+
+/*
+ Append a string in the given charset to the string
+ with character set recoding
+*/
+
+bool String::append(const char *s, size_t arg_length, const CHARSET_INFO *cs) {
+ size_t offset;
+
+ if (needs_conversion(arg_length, cs, m_charset, &offset)) {
+ size_t add_length;
+ if ((cs == &my_charset_bin) && offset) {
+ DBUG_ASSERT(m_charset->mbminlen > offset);
+ offset = m_charset->mbminlen - offset; // How many characters to pad
+ add_length = arg_length + offset;
+ if (mem_realloc_exp(m_length + add_length)) return true;
+ memset(m_ptr + m_length, 0, offset);
+ memcpy(m_ptr + m_length + offset, s, arg_length);
+ m_length += add_length;
+ return false;
+ }
+
+ add_length = arg_length / cs->mbminlen * m_charset->mbmaxlen;
+ uint dummy_errors;
+ if (mem_realloc_exp(m_length + add_length)) return true;
+ m_length += copy_and_convert(m_ptr + m_length, add_length, m_charset, s,
+ arg_length, cs, &dummy_errors);
+ } else {
+ if (mem_realloc_exp(m_length + arg_length)) return true;
+ memcpy(m_ptr + m_length, s, arg_length);
+ m_length += arg_length;
+ }
+ return false;
+}
+
+bool String::append(IO_CACHE *file, size_t arg_length) {
+ if (mem_realloc(m_length + arg_length)) return true;
+ if (my_b_read(file, reinterpret_cast<uchar *>(m_ptr) + m_length,
+ arg_length)) {
+ shrink(m_length);
+ return true;
+ }
+ m_length += arg_length;
+ return false;
+}
+
+/**
+ Append a parenthesized number to String.
+ Used in various pieces of SHOW related code.
+
+ @param nr Number
+ @param radix Radix, optional parameter, 10 by default.
+*/
+bool String::append_parenthesized(long nr, int radix) {
+ char buff[64], *end;
+ buff[0] = '(';
+ end = int10_to_str(nr, buff + 1, radix);
+ *end++ = ')';
+ return append(buff, (uint)(end - buff));
+}
+
+bool String::append_with_prefill(const char *s, size_t arg_length,
+ size_t full_length, char fill_char) {
+ size_t t_length = arg_length > full_length ? arg_length : full_length;
+
+ if (mem_realloc(m_length + t_length)) return true;
+ if (full_length > arg_length) {
+ t_length = full_length - arg_length;
+ memset(m_ptr + m_length, fill_char, t_length);
+ m_length = m_length + t_length;
+ }
+ append(s, arg_length);
+ return false;
+}
+
+size_t String::numchars() const {
+ return m_charset->cset->numchars(m_charset, m_ptr, m_ptr + m_length);
+}
+
+size_t String::charpos(size_t i, size_t offset) const {
+ if (i <= 0) return i;
+ return m_charset->cset->charpos(m_charset, m_ptr + offset, m_ptr + m_length,
+ i);
+}
+
+int String::strstr(const String &s, size_t offset) const {
+ if (s.length() + offset <= m_length) {
+ if (!s.length()) return ((int)offset); // Empty string is always found
+
+ const char *str = m_ptr + offset;
+ const char *search = s.ptr();
+ const char *end = m_ptr + m_length - s.length() + 1;
+ const char *search_end = s.ptr() + s.length();
+ skip:
+ while (str != end) {
+ if (*str++ == *search) {
+ const char *i = str;
+ const char *j = search + 1;
+ while (j != search_end)
+ if (*i++ != *j++) goto skip;
+ return (int)(str - m_ptr) - 1;
+ }
+ }
+ }
+ return -1;
+}
+
+/*
+** Search string from end. Offset is offset to the end of string
+*/
+
+int String::strrstr(const String &s, size_t offset) const {
+ if (s.length() <= offset && offset <= m_length) {
+ if (!s.length())
+ return static_cast<int>(offset); // Empty string is always found
+ const char *str = m_ptr + offset - 1;
+ const char *search = s.ptr() + s.length() - 1;
+
+ const char *end = m_ptr + s.length() - 2;
+ const char *search_end = s.ptr() - 1;
+ skip:
+ while (str != end) {
+ if (*str-- == *search) {
+ const char *i = str;
+ const char *j = search - 1;
+ while (j != search_end)
+ if (*i-- != *j--) goto skip;
+ return (int)(i - m_ptr) + 1;
+ }
+ }
+ }
+ return -1;
+}
+
+String String::substr(int offset, int count) const {
+ int original_count = this->numchars();
+ if (offset > original_count) {
+ offset = original_count;
+ }
+ if (offset + count > original_count) {
+ count = original_count - offset;
+ }
+ size_t bytes_offset = this->charpos(offset);
+
+ return String(this->m_ptr + bytes_offset,
+ this->charpos(offset + count) - bytes_offset, this->m_charset);
+}
+
+/*
+ Replace substring with string
+ If wrong parameter or not enough memory, do nothing
+*/
+
+bool String::replace(size_t offset, size_t arg_length, const String &to) {
+ return replace(offset, arg_length, to.ptr(), to.length());
+}
+
+bool String::replace(size_t offset, size_t arg_length, const char *to,
+ size_t to_length) {
+ long diff = static_cast<long>(to_length) - static_cast<long>(arg_length);
+ if (offset + arg_length <= m_length) {
+ if (diff < 0) {
+ if (to_length) memcpy(m_ptr + offset, to, to_length);
+ memmove(m_ptr + offset + to_length, m_ptr + offset + arg_length,
+ m_length - offset - arg_length);
+ } else {
+ if (diff) {
+ if (mem_realloc(m_length + diff)) return true;
+ memmove(m_ptr + offset + to_length, m_ptr + offset + arg_length,
+ m_length - offset - arg_length);
+ }
+ if (to_length) memcpy(m_ptr + offset, to, to_length);
+ }
+ m_length += diff;
+ }
+ return false;
+}
+
+// added by Holyfoot for "geometry" needs
+int String::reserve(size_t space_needed, size_t grow_by) {
+ if (m_alloced_length < m_length + space_needed) {
+ if (mem_realloc(m_alloced_length + max(space_needed, grow_by) - 1))
+ return true;
+ }
+ return false;
+}
+
+void qs_append(const char *str_in, size_t len, String *str) {
+ memcpy(&((*str)[str->length()]), str_in, len + 1);
+ str->length(str->length() + len);
+}
+
+void qs_append(double d, size_t len, String *str) {
+ char *buff = &((*str)[str->length()]);
+ int written = my_gcvt(d, MY_GCVT_ARG_DOUBLE, len, buff, NULL);
+ str->length(str->length() + written);
+}
+
+void qs_append(int i, String *str) {
+ char *buff = &((*str)[str->length()]);
+ char *end = int10_to_str(i, buff, -10);
+ str->length(str->length() + (int)(end - buff));
+}
+
+void qs_append(uint i, String *str) {
+ char *buff = &((*str)[str->length()]);
+ char *end = int10_to_str(i, buff, 10);
+ str->length(str->length() + (int)(end - buff));
+}
+
+/*
+ Compare strings according to collation, without end space.
+
+ SYNOPSIS
+ sortcmp()
+ s First string
+ t Second string
+ cs Collation
+
+ NOTE:
+ Normally this is case sensitive comparison
+
+ RETURN
+ < 0 s < t
+ 0 s == t
+ > 0 s > t
+*/
+
+int sortcmp(const String *s, const String *t, const CHARSET_INFO *cs) {
+ return cs->coll->strnncollsp(cs, (uchar *)s->ptr(), s->length(),
+ (uchar *)t->ptr(), t->length());
+}
+
+/*
+ Compare strings byte by byte. End spaces are also compared.
+
+ SYNOPSIS
+ stringcmp()
+ s First string
+ t Second string
+
+ NOTE:
+ Strings are compared as a stream of uchars
+
+ RETURN
+ < 0 s < t
+ 0 s == t
+ > 0 s > t
+*/
+
+int stringcmp(const String *s, const String *t) {
+ size_t s_len = s->length();
+ size_t t_len = t->length();
+ size_t len = min(s_len, t_len);
+ int cmp = (len == 0) ? 0 : memcmp(s->ptr(), t->ptr(), len);
+ return (cmp) ? cmp : static_cast<int>(s_len) - static_cast<int>(t_len);
+}
+
+/**
+ Makes a copy of a String's buffer unless it's already heap-allocated.
+
+ If the buffer ('str') of 'from' is on the heap, this function returns
+ 'from', possibly re-allocated to be at least from_length bytes long.
+ It is also the case if from==to or to==NULL.
+ Otherwise, this function makes and returns a copy of "from" into "to"; the
+ buffer of "to" is heap-allocated; a pre-condition is that \c from->str and
+ \c to->str must point to non-overlapping buffers.
+ The logic behind this complex design, is that a caller, typically a
+ val_str() function, sometimes has an input String ('from') which buffer it
+ wants to modify; but this String's buffer may or not be heap-allocated; if
+ it's not heap-allocated it is possibly in static storage or belongs to an
+ outer context, and thus should not be modified; in that case the caller
+ wants a heap-allocated copy which it can freely modify.
+
+ @param to destination string
+ @param from source string
+ @param from_length destination string will hold at least from_length bytes.
+ */
+
+String *copy_if_not_alloced(String *to, String *from, size_t from_length) {
+ if (from->m_is_alloced && from->m_alloced_length >= from_length) return from;
+ if ((from->m_is_alloced && (from->m_alloced_length != 0)) || !to ||
+ from == to) {
+ (void)from->mem_realloc(from_length, true /* force heap allocation */);
+ return from;
+ }
+ if (to->mem_realloc(from_length, true)) return from; // Actually an error
+
+ // from and to should not be overlapping
+ DBUG_ASSERT(!to->uses_buffer_owned_by(from));
+ DBUG_ASSERT(!from->uses_buffer_owned_by(to));
+
+ if ((to->m_length = min(from->m_length, from_length)))
+ memcpy(to->m_ptr, from->m_ptr, to->m_length);
+ to->m_charset = from->m_charset;
+ return to;
+}
+
+/****************************************************************************
+ Help functions
+****************************************************************************/
+
+/*
+ copy a string,
+ with optional character set conversion,
+ with optional left padding (for binary -> UCS2 conversion)
+
+ SYNOPSIS
+ well_formed_copy_nchars()
+ to Store result here
+ to_length Maxinum length of "to" string
+ to_cs Character set of "to" string
+ from Copy from here
+ from_length Length of from string
+ from_cs From character set
+ nchars Copy not more that nchars characters
+ well_formed_error_pos Return position when "from" is not well formed
+ or NULL otherwise.
+ cannot_convert_error_pos Return position where a not convertable
+ character met, or NULL otherwise.
+ from_end_pos Return position where scanning of "from"
+ string stopped.
+ NOTES
+
+ RETURN
+ length of bytes copied to 'to'
+*/
+
+size_t well_formed_copy_nchars(const CHARSET_INFO *to_cs, char *to,
+ size_t to_length, const CHARSET_INFO *from_cs,
+ const char *from, size_t from_length,
+ size_t nchars,
+ const char **well_formed_error_pos,
+ const char **cannot_convert_error_pos,
+ const char **from_end_pos) {
+ size_t res;
+
+ if ((to_cs == &my_charset_bin) || (from_cs == &my_charset_bin) ||
+ (to_cs == from_cs) || my_charset_same(from_cs, to_cs)) {
+ if (to_length < to_cs->mbminlen || !nchars) {
+ *from_end_pos = from;
+ *cannot_convert_error_pos = NULL;
+ *well_formed_error_pos = NULL;
+ return 0;
+ }
+
+ if (to_cs == &my_charset_bin) {
+ res = min(min(nchars, to_length), from_length);
+ memmove(to, from, res);
+ *from_end_pos = from + res;
+ *well_formed_error_pos = NULL;
+ *cannot_convert_error_pos = NULL;
+ } else {
+ int well_formed_error;
+ uint from_offset;
+
+ if ((from_offset = (from_length % to_cs->mbminlen)) &&
+ (from_cs == &my_charset_bin)) {
+ /*
+ Copying from BINARY to UCS2 needs to prepend zeros sometimes:
+ INSERT INTO t1 (ucs2_column) VALUES (0x01);
+ 0x01 -> 0x0001
+ */
+ uint pad_length = to_cs->mbminlen - from_offset;
+ memset(to, 0, pad_length);
+ memmove(to + pad_length, from, from_offset);
+ /*
+ In some cases left zero-padding can create an incorrect character.
+ For example:
+ INSERT INTO t1 (utf32_column) VALUES (0x110000);
+ We'll pad the value to 0x00110000, which is a wrong UTF32 sequence!
+ The valid characters range is limited to 0x00000000..0x0010FFFF.
+
+ Make sure we didn't pad to an incorrect character.
+ */
+ if (to_cs->cset->well_formed_len(to_cs, to, to + to_cs->mbminlen, 1,
+ &well_formed_error) !=
+ to_cs->mbminlen) {
+ *from_end_pos = *well_formed_error_pos = from;
+ *cannot_convert_error_pos = NULL;
+ return 0;
+ }
+ nchars--;
+ from += from_offset;
+ from_length -= from_offset;
+ to += to_cs->mbminlen;
+ to_length -= to_cs->mbminlen;
+ }
+
+ size_t min_length = min(from_length, to_length);
+ /*
+ If we operate on a multi-byte fixed-width character set, make
+ sure the string wasn't truncated in the middle of a character.
+ If so, truncate to a character boundary.
+ */
+ if (to_cs->mbmaxlen > 1 && to_cs->mbmaxlen == to_cs->mbminlen)
+ min_length -= min_length % to_cs->mbmaxlen;
+
+ res = to_cs->cset->well_formed_len(to_cs, from, from + min_length, nchars,
+ &well_formed_error);
+ if (res > 0) memmove(to, from, res);
+ *from_end_pos = from + res;
+
+ /*
+ If we are operating on a multi-byte variable-width character set and
+ "well_formed_error" is set to true, it means the string is not
+ well-formed (either partially or completely). But, in case of a
+ well-formed string whose string length is too long for the destination
+ buffer (i.e to_length), there is a possibility that the string is
+ truncated in the middle of a character, which would break its sequence.
+ This could lead to mistakenly rejecting the string as malformed.
+
+ To resolve this, we check if the full string contains a valid character
+ immediately after the returned end point. If it does, the string was
+ just truncated; if it doesn't, it was actually malformed.
+
+ For example: Consider a well-formed string of 300 bytes, which contained
+ a given three-byte code point at str[254..256]. Furthermore, suppose the
+ destination buffer is 255 bytes long. In this case, well_formed_len()
+ would return 254, so we would need to check the bytes str[254..257] to
+ see if they contain a well-formed character. This second invocation of
+ well_formed_len() would return 2, which takes us across the truncation
+ point, confirming that the problem was indeed truncation and not a
+ malformed code point.
+ */
+ if (well_formed_error && to_cs->mbmaxlen > 1 &&
+ res > min_length - to_cs->mbmaxlen) {
+ const char *from_end = from + min(res + to_cs->mbmaxlen, from_length);
+
+ size_t extra = to_cs->cset->well_formed_len(
+ to_cs, *from_end_pos, from_end, 1, &well_formed_error);
+
+ well_formed_error = (res + extra < min_length);
+ }
+
+ *well_formed_error_pos = well_formed_error ? *from_end_pos : nullptr;
+ *cannot_convert_error_pos = nullptr;
+ if (from_offset) res += to_cs->mbminlen;
+ }
+ } else {
+ int cnvres;
+ my_wc_t wc;
+ my_charset_conv_mb_wc mb_wc = from_cs->cset->mb_wc;
+ my_charset_conv_wc_mb wc_mb = to_cs->cset->wc_mb;
+ const uchar *from_end = (const uchar *)from + from_length;
+ uchar *to_end = (uchar *)to + to_length;
+ char *to_start = to;
+ *well_formed_error_pos = NULL;
+ *cannot_convert_error_pos = NULL;
+
+ for (; nchars; nchars--) {
+ const char *from_prev = from;
+ if ((cnvres = (*mb_wc)(from_cs, &wc, (uchar *)from, from_end)) > 0)
+ from += cnvres;
+ else if (cnvres == MY_CS_ILSEQ) {
+ if (!*well_formed_error_pos) *well_formed_error_pos = from;
+ from++;
+ wc = '?';
+ } else if (cnvres > MY_CS_TOOSMALL) {
+ /*
+ A correct multibyte sequence detected
+ But it doesn't have Unicode mapping.
+ */
+ if (!*cannot_convert_error_pos) *cannot_convert_error_pos = from;
+ from += (-cnvres);
+ wc = '?';
+ } else
+ break; // Not enough characters
+
+ outp:
+ if ((cnvres = (*wc_mb)(to_cs, wc, (uchar *)to, to_end)) > 0)
+ to += cnvres;
+ else if (cnvres == MY_CS_ILUNI && wc != '?') {
+ if (!*cannot_convert_error_pos) *cannot_convert_error_pos = from_prev;
+ wc = '?';
+ goto outp;
+ } else {
+ from = from_prev;
+ break;
+ }
+ }
+ *from_end_pos = from;
+ res = to - to_start;
+ }
+ return res;
+}
+
+void String::print(String *str) const {
+ char *st = m_ptr;
+ char *end = st + m_length;
+
+ if (str->reserve(m_length)) return;
+
+ for (; st < end; st++) {
+ uchar c = *st;
+ switch (c) {
+ case '\\':
+ str->append(STRING_WITH_LEN("\\\\"));
+ break;
+ case '\0':
+ str->append(STRING_WITH_LEN("\\0"));
+ break;
+ case '\'':
+ str->append(STRING_WITH_LEN("\\'"));
+ break;
+ case '\n':
+ str->append(STRING_WITH_LEN("\\n"));
+ break;
+ case '\r':
+ str->append(STRING_WITH_LEN("\\r"));
+ break;
+ case '\032': // Ctrl-Z
+ str->append(STRING_WITH_LEN("\\Z"));
+ break;
+ default:
+ str->append(c);
+ }
+ }
+}
+
+/*
+ Exchange state of this object and argument.
+
+ SYNOPSIS
+ String::swap()
+
+ RETURN
+ Target string will contain state of this object and vice versa.
+*/
+
+void String::swap(String &s) noexcept {
+ using std::swap;
+ swap(m_ptr, s.m_ptr);
+ swap(m_length, s.m_length);
+ swap(m_alloced_length, s.m_alloced_length);
+ swap(m_is_alloced, s.m_is_alloced);
+ swap(m_charset, s.m_charset);
+}
+
+char *String::dup(MEM_ROOT *root) const {
+ return strmake_root(root, m_ptr, m_length);
+}
+
+/**
+ Convert string to printable ASCII string
+
+ @details This function converts input string "from" replacing non-ASCII bytes
+ with hexadecimal sequences ("\xXX") optionally appending "..." to the end of
+ the resulting string.
+ This function used in the ER_TRUNCATED_WRONG_VALUE_FOR_FIELD error messages,
+ e.g. when a string cannot be converted to a result charset.
+
+
+ @param to output buffer
+ @param to_len size of the output buffer (8 bytes or greater)
+ @param from input string
+ @param from_len size of the input string
+ @param from_cs input charset
+ @param nbytes maximal number of bytes to convert (from_len if 0)
+
+ @return number of bytes in the output string
+*/
+
+size_t convert_to_printable(char *to, size_t to_len, const char *from,
+ size_t from_len, const CHARSET_INFO *from_cs,
+ size_t nbytes /*= 0*/) {
+ /* needs at least 8 bytes for '\xXX...' and zero byte */
+ DBUG_ASSERT(to_len >= 8);
+
+ char *t = to;
+ char *t_end = to + to_len - 1; // '- 1' is for the '\0' at the end
+ const char *f = from;
+ const char *f_end = from + (nbytes ? min(from_len, nbytes) : from_len);
+ char *dots = to; // last safe place to append '...'
+
+ if (!f || t == t_end) return 0;
+
+ for (; t < t_end && f < f_end; f++) {
+ /*
+ If the source string is ASCII compatible (mbminlen==1)
+ and the source character is in ASCII printable range (0x20..0x7F),
+ then display the character as is.
+
+ Otherwise, if the source string is not ASCII compatible (e.g. UCS2),
+ or the source character is not in the printable range,
+ then print the character using HEX notation.
+ */
+ if (((unsigned char)*f) >= 0x20 && ((unsigned char)*f) <= 0x7F &&
+ from_cs->mbminlen == 1) {
+ *t++ = *f;
+ } else {
+ if (t_end - t < 4) // \xXX
+ break;
+ *t++ = '\\';
+ *t++ = 'x';
+ *t++ = _dig_vec_upper[((unsigned char)*f) >> 4];
+ *t++ = _dig_vec_upper[((unsigned char)*f) & 0x0F];
+ }
+ if (t_end - t >= 3) // '...'
+ dots = t;
+ }
+ if (f < from + from_len)
+ memcpy(dots, STRING_WITH_LEN("...\0"));
+ else
+ *t = '\0';
+ return t - to;
+}
+
+/**
+ Convert a buffer to printable HEX encoded string
+ For eg: ABCDEF1234
+
+
+ @param to output buffer
+ @param to_len size of the output buffer (from_len*2 + 1 or greater)
+ @param from input buffer
+ @param from_len size of the input buffer
+
+ @return number of bytes in the output string
+*/
+size_t bin_to_hex_str(char *to, size_t to_len, char *from, size_t from_len) {
+ char *out;
+ char *in;
+ size_t i;
+
+ if (to_len < ((from_len * 2) + 1)) return 0;
+
+ out = to;
+ in = from;
+
+ for (i = 0; i < from_len; i++, in++) {
+ *out++ = _dig_vec_upper[((unsigned char)*in) >> 4];
+ *out++ = _dig_vec_upper[((unsigned char)*in) & 0xF];
+ }
+
+ *out = '\0';
+
+ return out - to;
+}
+
+/**
+ Check if an input byte sequence is a valid character string of a given charset
+
+ @param cs The input character set.
+ @param str The input byte sequence to validate.
+ @param length A byte length of the str.
+ @param [out] valid_length A byte length of a valid prefix of the str.
+ @param [out] length_error True in the case of a character length error:
+ some byte[s] in the input is not a valid
+ prefix for a character, i.e. the byte length
+ of that invalid character is undefined.
+
+ @retval true if the whole input byte sequence is a valid character string.
+ The length_error output parameter is undefined.
+
+ @return
+ if the whole input byte sequence is a valid character string
+ then
+ return false
+ else
+ if the length of some character in the input is undefined (MY_CS_ILSEQ)
+ or the last character is truncated (MY_CS_TOOSMALL)
+ then
+ *length_error= true; // fatal error!
+ else
+ *length_error= false; // non-fatal error: there is no wide character
+ // encoding for some input character
+ return true
+*/
+bool validate_string(const CHARSET_INFO *cs, const char *str, size_t length,
+ size_t *valid_length, bool *length_error) {
+ if (cs->mbmaxlen > 1) {
+ int well_formed_error;
+ *valid_length = cs->cset->well_formed_len(cs, str, str + length, length,
+ &well_formed_error);
+ *length_error = well_formed_error;
+ return well_formed_error;
+ }
+
+ /*
+ well_formed_len() is not functional on single-byte character sets,
+ so use mb_wc() instead:
+ */
+ *length_error = false;
+
+ const uchar *from = reinterpret_cast<const uchar *>(str);
+ const uchar *from_end = from + length;
+ my_charset_conv_mb_wc mb_wc = cs->cset->mb_wc;
+
+ while (from < from_end) {
+ my_wc_t wc;
+ int cnvres = (*mb_wc)(cs, &wc, (uchar *)from, from_end);
+ if (cnvres <= 0) {
+ *valid_length = from - reinterpret_cast<const uchar *>(str);
+ return true;
+ }
+ from += cnvres;
+ }
+ *valid_length = length;
+ return false;
+}
+
+/**
+ Appends from_str to to_str, escaping certain characters.
+
+ @param [in,out] to_str The destination string.
+ @param [in] from_str The source string.
+
+ @return false on success, true on error.
+*/
+
+bool append_escaped(String *to_str, const String *from_str) {
+ if (to_str->mem_realloc(to_str->length() + from_str->length()))
+ return true; // OOM
+
+ const char *from = from_str->ptr();
+ const char *end = from + from_str->length();
+ for (; from < end; from++) {
+ char c = *from;
+ switch (c) {
+ case '\0':
+ c = '0';
+ break;
+ case '\032':
+ c = 'Z';
+ break;
+ case '\\':
+ case '\'':
+ break;
+ default:
+ goto normal_character;
+ }
+ if (to_str->append('\\')) return true; // OOM
+
+ normal_character:
+ if (to_str->append(c)) return true; // OOM
+ }
+ return false;
+}
diff --git a/libmysqlclient/mysql/sql-common/sql_string.cc.orig b/libmysqlclient/mysql/sql-common/sql_string.cc.orig
new file mode 120000
index 0000000..eca6a47
--- /dev/null
+++ b/libmysqlclient/mysql/sql-common/sql_string.cc.orig
@@ -0,0 +1 @@
+../../../upstream/sql-common/sql_string.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings b/libmysqlclient/mysql/strings
deleted file mode 120000
index 20be740..0000000
--- a/libmysqlclient/mysql/strings
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream/strings \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/README b/libmysqlclient/mysql/strings/README
new file mode 120000
index 0000000..73c31e0
--- /dev/null
+++ b/libmysqlclient/mysql/strings/README
@@ -0,0 +1 @@
+../../../upstream/strings/README \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/conf_to_src.cc b/libmysqlclient/mysql/strings/conf_to_src.cc
new file mode 120000
index 0000000..7725bda
--- /dev/null
+++ b/libmysqlclient/mysql/strings/conf_to_src.cc
@@ -0,0 +1 @@
+../../../upstream/strings/conf_to_src.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-big5.cc b/libmysqlclient/mysql/strings/ctype-big5.cc
new file mode 120000
index 0000000..433d411
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-big5.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-big5.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-bin.cc b/libmysqlclient/mysql/strings/ctype-bin.cc
new file mode 120000
index 0000000..8c950a1
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-bin.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-bin.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-cp932.cc b/libmysqlclient/mysql/strings/ctype-cp932.cc
new file mode 120000
index 0000000..831921d
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-cp932.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-cp932.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-czech.cc b/libmysqlclient/mysql/strings/ctype-czech.cc
new file mode 100644
index 0000000..1440466
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-czech.cc
@@ -0,0 +1,699 @@
+/* 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 strings/ctype-czech.c for MySQL.
+
+ This file implements the Czech sorting for the MySQL database
+ server (www.mysql.com). Due to some complicated rules the
+ Czech language has for sorting strings, a more complex
+ solution was needed than the one-to-one conversion table. To
+ note a few, here is an example of a Czech sorting sequence:
+
+ co < hlaska < hláska < hlava < chlapec < krtek
+
+ It because some of the rules are: double char 'ch' is sorted
+ between 'h' and 'i'. Accented character 'á' (a with acute) is
+ sorted after 'a' and before 'b', but only if the word is
+ otherwise the same. However, because 's' is sorted before 'v'
+ in hlava, the accentness of 'á' is overridden. There are many
+ more rules.
+
+ This file defines functions my_strxfrm and my_strcoll for
+ C-like zero terminated strings and my_strnxfrm and my_strnncoll
+ for strings where the length comes as an parameter. Also
+ defined here you will find function my_like_range that returns
+ index range strings for LIKE expression and the
+ MY_STRXFRM_MULTIPLY set to value 4 -- this is the ratio the
+ strings grows during my_strxfrm. The algorithm has four
+ passes, that's why we need four times more space for expanded
+ string.
+
+ This file also contains the ISO-Latin-2 definitions of
+ characters.
+
+ Author: (c) 1997--1998 Jan Pazdziora, adelton@fi.muni.cz
+ Jan Pazdziora has a shared copyright for this code
+
+ The original of this file can also be found at
+ http://www.fi.muni.cz/~adelton/l10n/
+
+ Bug reports and suggestions are always welcome.
+*/
+
+/*
+ * This comment is parsed by configure to create ctype.c,
+ * so don't change it unless you know what you are doing.
+ *
+ * .configure. strxfrm_multiply_czech=4
+ */
+
+#include <string.h>
+#include <sys/types.h>
+
+#include "m_ctype.h"
+#include "my_compiler.h"
+#include "my_inttypes.h"
+
+/*
+ These are four tables for four passes of the algorithm. Please see
+ below for what are the "special values"
+*/
+
+static const unsigned char literal0[] =
+ "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\043\044\045\046\047\050"
+ "\051\052\053\054\000\000\000\000\000\000\000\003\004\377\007\010\011\012"
+ "\013\015\016\017\020\022\023\024\025\026\027\031\033\034\035\036\037\040"
+ "\041\000\000\000\000\000\000\003\004\377\007\010\011\012\013\015\016\017"
+ "\020\022\023\024\025\026\027\031\033\034\035\036\037\040\041\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
+ "\000\021\000\020\032\000\000\032\032\033\042\000\042\042\000\003\000\021"
+ "\000\020\032\000\000\032\032\033\042\000\042\042\027\003\003\003\003\020"
+ "\006\006\006\010\010\010\010\015\015\007\007\023\023\024\024\024\024\000"
+ "\030\034\034\034\034\040\033\000\027\003\003\003\003\020\006\006\006\010"
+ "\010\010\010\015\015\007\007\023\023\024\024\024\024\000\030\034\034\034"
+ "\034\040\033\000";
+static const unsigned char literal1[] =
+ "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\106\107\110\111\112\113"
+ "\114\115\116\117\000\000\000\000\000\000\000\003\011\377\016\021\026\027"
+ "\030\032\035\036\037\043\044\047\054\055\056\061\065\070\075\076\077\100"
+ "\102\000\000\000\000\000\000\003\011\377\016\021\026\027\030\032\035\036"
+ "\037\043\044\047\054\055\056\061\065\070\075\076\077\100\102\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"
+ "\000\042\000\041\063\000\000\062\064\066\104\000\103\105\000\010\000\042"
+ "\000\041\063\000\000\062\064\066\104\000\103\105\057\004\005\007\006\040"
+ "\014\015\013\022\025\024\023\033\034\017\020\046\045\050\051\053\052\000"
+ "\060\072\071\074\073\101\067\000\057\004\005\007\006\040\014\015\013\022"
+ "\025\024\023\033\034\017\020\046\045\050\051\053\052\000\060\072\071\074"
+ "\073\101\067\000";
+static const unsigned char literal2[] =
+ "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\212\213\214\215\216\217"
+ "\220\221\222\223\000\000\000\000\000\000\000\004\020\377\032\040\052\054"
+ "\056\063\071\073\075\105\107\115\127\131\133\141\151\157\171\173\175\177"
+ "\203\000\000\000\000\000\000\003\017\377\031\037\051\053\055\062\070\072"
+ "\074\104\106\114\126\130\132\140\150\156\170\172\174\176\202\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\016"
+ "\000\103\000\101\145\000\000\143\147\153\207\000\205\211\000\015\000\102"
+ "\000\100\144\000\000\142\146\152\206\000\204\210\135\006\010\014\012\077"
+ "\026\030\024\042\050\046\044\065\067\034\036\113\111\117\121\125\123\000"
+ "\137\163\161\167\165\201\155\000\134\005\007\013\011\076\025\027\023\041"
+ "\047\045\043\064\066\033\035\112\110\116\120\124\122\000\136\162\160\166"
+ "\164\200\154\000";
+static const unsigned char literal3[] =
+ "\264\265\266\267\270\271\272\273\274\002\276\277\300\301\302\303\304\305"
+ "\306\307\310\311\312\313\314\315\316\317\320\321\322\323\002\230\232\253"
+ "\324\252\251\234\240\241\261\260\225\262\224\235\212\213\214\215\216\217"
+ "\220\221\222\223\231\226\244\257\245\227\250\004\020\377\032\040\052\054"
+ "\056\063\071\073\075\105\107\115\127\131\133\141\151\157\171\173\175\177"
+ "\203\242\237\243\254\255\233\003\017\377\031\037\051\053\055\062\070\072"
+ "\074\104\106\114\126\130\132\140\150\156\170\172\174\176\202\246\236\247"
+ "\256\325\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303"
+ "\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\326\016"
+ "\327\103\330\101\145\331\332\143\147\153\207\333\205\211\334\015\335\102"
+ "\336\100\144\337\340\142\146\152\206\341\204\210\135\006\010\014\012\077"
+ "\026\030\024\042\050\046\044\065\067\034\036\113\111\117\121\125\123\263"
+ "\137\163\161\167\165\201\155\342\134\005\007\013\011\076\025\027\023\041"
+ "\047\045\043\064\066\033\035\112\110\116\120\124\122\343\136\162\160\166"
+ "\164\200\154\344";
+
+static const unsigned char *CZ_SORT_TABLE[] = {literal0, literal1, literal2,
+ literal3};
+
+/*
+ These define the valuse for the double chars that need to be
+ sorted as they were single characters -- in Czech these are
+ 'ch', 'Ch' and 'CH'.
+*/
+
+namespace {
+
+struct wordvalue {
+ const char *word;
+ uchar *outvalue;
+};
+
+} // namespace
+
+static struct wordvalue doubles[] = {
+ {"ch", (uchar *)"\014\031\057\057"}, {"Ch", (uchar *)"\014\031\060\060"},
+ {"CH", (uchar *)"\014\031\061\061"}, {"c", (uchar *)"\005\012\021\021"},
+ {"C", (uchar *)"\005\012\022\022"},
+};
+
+/*
+ Unformal description of the algorithm:
+
+ We walk the string left to right.
+
+ The end of the string is either passed as parameter, or is
+ *p == 0. This is hidden in the IS_END macro.
+
+ In the first two passes, we compare word by word. So we make
+ first and second pass on the first word, first and second pass
+ on the second word, etc. If we come to the end of the string
+ during the first pass, we need to jump to the last word of the
+ second pass.
+
+ End of pass is marked with value 1 on the output.
+
+ For each character, we read it's value from the table.
+
+ If the value is ignore (0), we go straight to the next character.
+
+ If the value is space/end of word (2) and we are in the first
+ or second pass, we skip all characters having value 0 -- 2 and
+ switch the passwd.
+
+ If it's the compose character (255), we check if the double
+ exists behind it, find its value.
+
+ We append 0 to the end.
+---
+ Neformální popis algoritmu:
+
+ Procházíme řetězec zleva doprava.
+
+ Konec řetězce je předán buď jako parametr, nebo je to *p == 0.
+ Toto je ošetřeno makrem IS_END.
+
+ Pokud jsme došli na konec řetězce při průchodu 0, nejdeme na
+ začátek, ale na uloženou pozici, protože první a druhý průchod
+ běží současně.
+
+ Konec vstupu (průchodu) označíme na výstupu hodnotou 1.
+
+ Pro každý znak řetězce načteme hodnotu z třídící tabulky.
+
+ Jde-li o hodnotu ignorovat (0), skočíme ihned na další znak..
+
+ Jde-li o hodnotu konec slova (2) a je to průchod 0 nebo 1,
+ přeskočíme všechny další 0 -- 2 a prohodíme průchody.
+
+ Jde-li o kompozitní znak (255), otestujeme, zda následuje
+ správný do dvojice, dohledáme správnou hodnotu.
+
+ Na konci připojíme znak 0
+ */
+
+#define ADD_TO_RESULT(dest, len, totlen, value) \
+ { \
+ if ((totlen) < (len)) { \
+ dest[totlen++] = value; \
+ } \
+ }
+#define IS_END(p, src, len) (((char *)p - (char *)src) >= (len))
+
+#define NEXT_CMP_VALUE(src, p, store, pass, value, len) \
+ while (1) { \
+ if (IS_END(p, src, len)) { \
+ /* when we are at the end of string */ \
+ /* return either 0 for end of string */ \
+ /* or 1 for end of pass */ \
+ value = 0; \
+ if (pass != 3) { \
+ p = (pass++ == 0) ? store : src; \
+ value = 1; \
+ } \
+ break; \
+ } \
+ /* not at end of string */ \
+ value = CZ_SORT_TABLE[pass][*p]; \
+ if (value == 0) { \
+ p++; \
+ continue; \
+ } /* ignore value */ \
+ if (value == 2) /* space */ \
+ { \
+ const uchar *tmp; \
+ const uchar *runner = ++p; \
+ while (!(IS_END(runner, src, len)) && \
+ (CZ_SORT_TABLE[pass][*runner] == 2)) \
+ runner++; /* skip all spaces */ \
+ if (IS_END(runner, src, len)) p = runner; \
+ if ((pass <= 2) && !(IS_END(runner, src, len))) p = runner; \
+ if (IS_END(p, src, len)) continue; \
+ /* we switch passes */ \
+ if (pass > 1) break; \
+ tmp = p; \
+ pass = 1 - pass; \
+ p = store; \
+ store = tmp; \
+ break; \
+ } \
+ if (value == 255) { \
+ int i; \
+ for (i = 0; i < (int)sizeof(doubles); i++) { \
+ const char *pattern = doubles[i].word; \
+ const char *q = (const char *)p; \
+ int j = 0; \
+ while (pattern[j]) { \
+ if (IS_END(q, src, len) || (*q != pattern[j])) break; \
+ j++; \
+ q++; \
+ } \
+ if (!(pattern[j])) { \
+ value = (int)(doubles[i].outvalue[pass]); \
+ p = (const uchar *)q - 1; \
+ break; \
+ } \
+ } \
+ } \
+ p++; \
+ break; \
+ }
+
+/*
+ Function strnncoll, actually strcoll, with Czech sorting, which expect
+ the length of the strings being specified
+*/
+
+extern "C" {
+static int my_strnncoll_czech(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+ const uchar *s1, size_t len1, const uchar *s2,
+ size_t len2, bool s2_is_prefix) {
+ int v1, v2;
+ const uchar *p1, *p2, *store1, *store2;
+ int pass1 = 0, pass2 = 0;
+
+ if (s2_is_prefix && len1 > len2) len1 = len2;
+
+ p1 = s1;
+ p2 = s2;
+ store1 = s1;
+ store2 = s2;
+
+ do {
+ int diff;
+ NEXT_CMP_VALUE(s1, p1, store1, pass1, v1, (int)len1);
+ NEXT_CMP_VALUE(s2, p2, store2, pass2, v2, (int)len2);
+ if ((diff = v1 - v2)) return diff;
+ } while (v1);
+ return 0;
+}
+
+/*
+ TODO: Fix this one to compare strings as they are done in ctype-simple1
+*/
+
+static int my_strnncollsp_czech(const CHARSET_INFO *cs, const uchar *s,
+ size_t slen, const uchar *t, size_t tlen) {
+ for (; slen && s[slen - 1] == ' '; slen--)
+ ;
+ for (; tlen && t[tlen - 1] == ' '; tlen--)
+ ;
+ return my_strnncoll_czech(cs, s, slen, t, tlen, 0);
+}
+
+/*
+ Returns the number of bytes required for strnxfrm().
+*/
+static size_t my_strnxfrmlen_czech(
+ const CHARSET_INFO *cs MY_ATTRIBUTE((unused)), size_t len) {
+ return len * 4 + 4;
+}
+
+/*
+ Function strnxfrm, actually strxfrm, with Czech sorting, which expect
+ the length of the strings being specified
+*/
+
+static size_t my_strnxfrm_czech(const CHARSET_INFO *cs MY_ATTRIBUTE((unused)),
+ uchar *dest, size_t len,
+ uint nweights_arg MY_ATTRIBUTE((unused)),
+ const uchar *src, size_t srclen, uint flags) {
+ int value;
+ const uchar *p, *store;
+ int pass = 0;
+ size_t totlen = 0;
+ p = src;
+ store = src;
+
+ if (!(flags & 0x0F)) /* All levels by default */
+ flags |= 0x0F;
+
+ do {
+ int add = (1 << pass) & flags; /* If this level is needed */
+ NEXT_CMP_VALUE(src, p, store, pass, value, (int)srclen);
+ if (add) ADD_TO_RESULT(dest, len, totlen, value);
+ } while (value);
+ if ((flags & MY_STRXFRM_PAD_TO_MAXLEN) && len > totlen) {
+ memset(dest + totlen, ' ', len - totlen);
+ totlen = len;
+ }
+ return totlen;
+}
+} // extern "C"
+
+#undef IS_END
+
+/*
+ Neformální popis algoritmu:
+
+ procházíme řetězec zleva doprava
+ konec řetězce poznáme podle *p == 0
+ pokud jsme došli na konec řetězce při průchodu 0, nejdeme na
+ začátek, ale na uloženou pozici, protože první a druhý
+ průchod běží současně
+ konec vstupu (průchodu) označíme na výstupu hodnotou 1
+
+ načteme hodnotu z třídící tabulky
+ jde-li o hodnotu ignorovat (0), skočíme na další průchod
+ jde-li o hodnotu konec slova (2) a je to průchod 0 nebo 1,
+ přeskočíme všechny další 0 -- 2 a prohodíme
+ průchody
+ jde-li o kompozitní znak (255), otestujeme, zda následuje
+ správný do dvojice, dohledáme správnou hodnotu
+
+ na konci připojíme znak 0
+ */
+
+/*
+** Calculate min_str and max_str that ranges a LIKE string.
+** Arguments:
+** ptr Pointer to LIKE string.
+** ptr_length Length of LIKE string.
+** escape Escape character in LIKE. (Normally '\').
+** All escape characters should be removed from min_str and max_str
+** res_length Length of min_str and max_str.
+** min_str Smallest case sensitive string that ranges LIKE.
+** Should be space padded to res_length.
+** max_str Largest case sensitive string that ranges LIKE.
+** Normally padded with the biggest character sort value.
+**
+** The function should return 0 if ok and 1 if the LIKE string can't be
+** optimized !
+*/
+
+#define min_sort_char ' '
+#define max_sort_char '9'
+
+extern "C" {
+static bool my_like_range_czech(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) {
+ uchar value;
+ const char *end = ptr + ptr_length;
+ char *min_org = min_str;
+ char *min_end = min_str + res_length;
+
+ for (; ptr != end && min_str != min_end; ptr++) {
+ if (*ptr == w_one) /* '_' in SQL */
+ {
+ break;
+ }
+ if (*ptr == w_many) /* '%' in SQL */
+ {
+ break;
+ }
+
+ if (*ptr == escape && ptr + 1 != end) {
+ ptr++;
+ } /* Skip escape */
+
+ value = CZ_SORT_TABLE[0][(int)(uchar)*ptr];
+
+ if (value == 0) /* Ignore in the first pass */
+ {
+ continue;
+ }
+ if (value <= 2) /* End of pass or end of string */
+ {
+ break;
+ }
+ if (value == 255) /* Double char too compicated */
+ {
+ break;
+ }
+
+ *min_str++ = *max_str++ = *ptr;
+ }
+
+ if (cs->state & MY_CS_BINSORT)
+ *min_length = (size_t)(min_str - min_org);
+ else {
+ /* 'a\0\0... is the smallest possible string */
+ *min_length = res_length;
+ }
+ /* a\ff\ff... is the biggest possible string */
+ *max_length = res_length;
+
+ while (min_str != min_end) {
+ *min_str++ = min_sort_char; /* Because of key compression */
+ *max_str++ = max_sort_char;
+ }
+ return 0;
+}
+} // extern "C"
+
+/*
+ * File generated by cset
+ * (C) Abandoned 1997 Zarko Mocnik <zarko.mocnik@dem.si>
+ *
+ * definition table reworked by Jaromir Dolecek <dolecek@ics.muni.cz>
+ */
+
+static const uchar ctype_czech[257] = {
+ 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 32, 72, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, 16, 16, 16, 16, 16,
+ 16, 16, 129, 129, 129, 129, 129, 129, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 16, 16, 16, 16,
+ 16, 16, 130, 130, 130, 130, 130, 130, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 16, 16, 16, 16,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 40, 40, 40, 40, 40, 32, 32,
+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 72, 1, 16, 1, 16, 1, 1, 16, 0, 0, 1, 1, 1, 1, 16, 1,
+ 1, 16, 2, 16, 2, 16, 2, 2, 16, 16, 2, 2, 2, 2, 16, 2,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 16, 1, 1, 1, 1, 1, 1, 16, 1, 1, 1, 1, 1, 1, 1,
+ 16, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 16, 2, 2, 2, 2, 2, 2, 2,
+ 16,
+};
+
+static const uchar to_lower_czech[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 177, 161, 179, 163, 181,
+ 182, 166, 167, 168, 185, 186, 187, 188, 173, 190, 191, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 224, 225, 226,
+ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 208, 241,
+ 242, 243, 244, 245, 246, 215, 248, 249, 250, 251, 252, 253, 254, 223, 224,
+ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255,
+};
+
+static const uchar to_upper_czech[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 160, 178, 162,
+ 180, 164, 165, 183, 184, 169, 170, 171, 172, 189, 174, 175, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 192,
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 240, 209, 210, 211, 212, 213, 214, 247, 216, 217, 218, 219, 220, 221, 222,
+ 255,
+};
+
+static const uchar sort_order_czech[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 71, 72, 76, 78, 83, 84, 85, 86, 90,
+ 91, 92, 96, 97, 100, 105, 106, 107, 110, 114, 117, 122, 123, 124, 125,
+ 127, 131, 132, 133, 134, 135, 136, 65, 71, 72, 76, 78, 83, 84, 85,
+ 86, 90, 91, 92, 96, 97, 100, 105, 106, 107, 110, 114, 117, 122, 123,
+ 124, 125, 127, 137, 138, 139, 140, 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 255, 66, 255, 93, 255, 94,
+ 111, 255, 255, 255, 112, 113, 115, 128, 255, 129, 130, 255, 66, 255, 93,
+ 255, 94, 111, 255, 255, 112, 113, 115, 128, 255, 129, 130, 108, 67, 68,
+ 69, 70, 95, 73, 75, 74, 79, 81, 82, 80, 89, 87, 77, 255, 98,
+ 99, 101, 102, 103, 104, 255, 109, 119, 118, 120, 121, 126, 116, 255, 108,
+ 67, 68, 69, 70, 95, 73, 75, 74, 79, 81, 82, 80, 89, 88, 77,
+ 255, 98, 99, 101, 102, 103, 104, 255, 109, 119, 118, 120, 121, 126, 116,
+ 255,
+};
+
+static uint16 tab_8859_2_uni[256] = {
+ 0, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008,
+ 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011,
+ 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A,
+ 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023,
+ 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C,
+ 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035,
+ 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E,
+ 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
+ 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050,
+ 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059,
+ 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062,
+ 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B,
+ 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074,
+ 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D,
+ 0x007E, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0x00A0, 0x0104,
+ 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, 0x015E,
+ 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105, 0x02DB, 0x0142,
+ 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A,
+ 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139,
+ 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE,
+ 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+ 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155,
+ 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9,
+ 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148,
+ 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171,
+ 0x00FC, 0x00FD, 0x0163, 0x02D9};
+
+/* 0000-00FD , 254 chars */
+static const uchar tab_uni_8859_2_plane00[] = {
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
+ 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
+ 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
+ 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53,
+ 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
+ 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+ 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0xA4, 0x00, 0x00, 0xA7,
+ 0xA8, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00,
+ 0xB4, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xC1, 0xC2, 0x00, 0xC4, 0x00, 0x00, 0xC7, 0x00, 0xC9, 0x00, 0xCB,
+ 0x00, 0xCD, 0xCE, 0x00, 0x00, 0x00, 0x00, 0xD3, 0xD4, 0x00, 0xD6, 0xD7,
+ 0x00, 0x00, 0xDA, 0x00, 0xDC, 0xDD, 0x00, 0xDF, 0x00, 0xE1, 0xE2, 0x00,
+ 0xE4, 0x00, 0x00, 0xE7, 0x00, 0xE9, 0x00, 0xEB, 0x00, 0xED, 0xEE, 0x00,
+ 0x00, 0x00, 0x00, 0xF3, 0xF4, 0x00, 0xF6, 0xF7, 0x00, 0x00, 0xFA, 0x00,
+ 0xFC, 0xFD};
+
+/* 0102-017E , 125 chars */
+static const uchar tab_uni_8859_2_plane01[] = {
+ 0xC3, 0xE3, 0xA1, 0xB1, 0xC6, 0xE6, 0x00, 0x00, 0x00, 0x00, 0xC8, 0xE8,
+ 0xCF, 0xEF, 0xD0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xEA,
+ 0xCC, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC5, 0xE5, 0x00, 0x00, 0xA5,
+ 0xB5, 0x00, 0x00, 0xA3, 0xB3, 0xD1, 0xF1, 0x00, 0x00, 0xD2, 0xF2, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0xF5, 0x00, 0x00, 0xC0, 0xE0,
+ 0x00, 0x00, 0xD8, 0xF8, 0xA6, 0xB6, 0x00, 0x00, 0xAA, 0xBA, 0xA9, 0xB9,
+ 0xDE, 0xFE, 0xAB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xD9, 0xF9, 0xDB, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC,
+ 0xBC, 0xAF, 0xBF, 0xAE, 0xBE};
+
+/* 02C7-02DD , 23 chars */
+static const uchar tab_uni_8859_2_plane02[] = {
+ 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xFF, 0x00, 0xB2, 0x00, 0xBD};
+
+static MY_UNI_IDX idx_uni_8859_2[] = {{0x0000, 0x00FD, tab_uni_8859_2_plane00},
+ {0x0102, 0x017E, tab_uni_8859_2_plane01},
+ {0x02C7, 0x02DD, tab_uni_8859_2_plane02},
+ {0, 0, NULL}};
+
+static MY_COLLATION_HANDLER my_collation_latin2_czech_ci_handler = {
+ nullptr, /* init */
+ nullptr,
+ my_strnncoll_czech,
+ my_strnncollsp_czech,
+ my_strnxfrm_czech,
+ my_strnxfrmlen_czech,
+ my_like_range_czech,
+ my_wildcmp_bin,
+ my_strcasecmp_8bit,
+ my_instr_simple,
+ my_hash_sort_simple,
+ my_propagate_simple};
+
+CHARSET_INFO my_charset_latin2_czech_ci = {
+ 2,
+ 0,
+ 0, /* number */
+ MY_CS_COMPILED | MY_CS_STRNXFRM | MY_CS_CSSORT, /* state */
+ "latin2", /* cs name */
+ "latin2_czech_cs", /* name */
+ "", /* comment */
+ NULL, /* tailoring */
+ NULL, /* coll_param */
+ ctype_czech,
+ to_lower_czech,
+ to_upper_czech,
+ sort_order_czech,
+ NULL, /* uca */
+ tab_8859_2_uni, /* tab_to_uni */
+ idx_uni_8859_2, /* tab_from_uni */
+ &my_unicase_default, /* caseinfo */
+ NULL, /* state_map */
+ NULL, /* ident_map */
+ 4, /* strxfrm_multiply */
+ 1, /* caseup_multiply */
+ 1, /* casedn_multiply */
+ 1, /* mbminlen */
+ 1, /* mbmaxlen */
+ 1, /* mbmaxlenlen */
+ 0, /* min_sort_char */
+ 0, /* max_sort_char */
+ ' ', /* pad char */
+ 0, /* escape_with_backslash_is_dangerous */
+ 4, /* levels_for_compare */
+ &my_charset_8bit_handler,
+ &my_collation_latin2_czech_ci_handler,
+ PAD_SPACE};
diff --git a/libmysqlclient/mysql/strings/ctype-czech.cc.orig b/libmysqlclient/mysql/strings/ctype-czech.cc.orig
new file mode 120000
index 0000000..0103cf9
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-czech.cc.orig
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-czech.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-euc_kr.cc b/libmysqlclient/mysql/strings/ctype-euc_kr.cc
new file mode 120000
index 0000000..58db6b2
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-euc_kr.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-euc_kr.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-eucjpms.cc b/libmysqlclient/mysql/strings/ctype-eucjpms.cc
new file mode 120000
index 0000000..70a1fb9
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-eucjpms.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-eucjpms.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-extra.cc b/libmysqlclient/mysql/strings/ctype-extra.cc
new file mode 120000
index 0000000..427be70
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-extra.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-extra.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-gb18030.cc b/libmysqlclient/mysql/strings/ctype-gb18030.cc
new file mode 120000
index 0000000..600a5f1
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-gb18030.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-gb18030.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-gb2312.cc b/libmysqlclient/mysql/strings/ctype-gb2312.cc
new file mode 120000
index 0000000..33252d0
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-gb2312.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-gb2312.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-gbk.cc b/libmysqlclient/mysql/strings/ctype-gbk.cc
new file mode 120000
index 0000000..5fd3798
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-gbk.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-gbk.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-latin1.cc b/libmysqlclient/mysql/strings/ctype-latin1.cc
new file mode 120000
index 0000000..d60fba2
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-latin1.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-latin1.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-mb.cc b/libmysqlclient/mysql/strings/ctype-mb.cc
new file mode 120000
index 0000000..85191b0
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-mb.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-mb.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-simple.cc b/libmysqlclient/mysql/strings/ctype-simple.cc
new file mode 120000
index 0000000..dbed3d9
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-simple.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-simple.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-sjis.cc b/libmysqlclient/mysql/strings/ctype-sjis.cc
new file mode 120000
index 0000000..2de1db9
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-sjis.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-sjis.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-tis620.cc b/libmysqlclient/mysql/strings/ctype-tis620.cc
new file mode 120000
index 0000000..9e8432a
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-tis620.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-tis620.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-uca.cc b/libmysqlclient/mysql/strings/ctype-uca.cc
new file mode 120000
index 0000000..13e98fc
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-uca.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-uca.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-ucs2.cc b/libmysqlclient/mysql/strings/ctype-ucs2.cc
new file mode 120000
index 0000000..6d77535
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-ucs2.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-ucs2.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-ujis.cc b/libmysqlclient/mysql/strings/ctype-ujis.cc
new file mode 120000
index 0000000..5bb5658
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-ujis.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-ujis.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-utf8.cc b/libmysqlclient/mysql/strings/ctype-utf8.cc
new file mode 120000
index 0000000..1701dd5
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-utf8.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-utf8.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype-win1250ch.cc b/libmysqlclient/mysql/strings/ctype-win1250ch.cc
new file mode 120000
index 0000000..756e33e
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype-win1250ch.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype-win1250ch.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/ctype.cc b/libmysqlclient/mysql/strings/ctype.cc
new file mode 120000
index 0000000..92ee673
--- /dev/null
+++ b/libmysqlclient/mysql/strings/ctype.cc
@@ -0,0 +1 @@
+../../../upstream/strings/ctype.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/decimal.cc b/libmysqlclient/mysql/strings/decimal.cc
new file mode 100644
index 0000000..05a8503
--- /dev/null
+++ b/libmysqlclient/mysql/strings/decimal.cc
@@ -0,0 +1,2482 @@
+/* Copyright (c) 2004, 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 */
+
+/*
+=======================================================================
+ NOTE: this library implements SQL standard "exact numeric" type
+ and is not at all generic, but rather intentinally crippled to
+ follow the standard :)
+=======================================================================
+ Quoting the standard
+ (SQL:2003, Part 2 Foundations, aka ISO/IEC 9075-2:2003)
+
+4.4.2 Characteristics of numbers, page 27:
+
+ An exact numeric type has a precision P and a scale S. P is a positive
+ integer that determines the number of significant digits in a
+ particular radix R, where R is either 2 or 10. S is a non-negative
+ integer. Every value of an exact numeric type of scale S is of the
+ form n*10^{-S}, where n is an integer such that -R^P <= n <= R^P.
+
+ [...]
+
+ If an assignment of some number would result in a loss of its most
+ significant digit, an exception condition is raised. If least
+ significant digits are lost, implementation-defined rounding or
+ truncating occurs, with no exception condition being raised.
+
+ [...]
+
+ Whenever an exact or approximate numeric value is assigned to an exact
+ numeric value site, an approximation of its value that preserves
+ leading significant digits after rounding or truncating is represented
+ in the declared type of the target. The value is converted to have the
+ precision and scale of the target. The choice of whether to truncate
+ or round is implementation-defined.
+
+ [...]
+
+ All numeric values between the smallest and the largest value,
+ inclusive, in a given exact numeric type have an approximation
+ obtained by rounding or truncation for that type; it is
+ implementation-defined which other numeric values have such
+ approximations.
+
+5.3 <literal>, page 143
+
+ <exact numeric literal> ::=
+ <unsigned integer> [ <period> [ <unsigned integer> ] ]
+ | <period> <unsigned integer>
+
+6.1 <data type>, page 165:
+
+ 19) The <scale> of an <exact numeric type> shall not be greater than
+ the <precision> of the <exact numeric type>.
+
+ 20) For the <exact numeric type>s DECIMAL and NUMERIC:
+
+ a) The maximum value of <precision> is implementation-defined.
+ <precision> shall not be greater than this value.
+ b) The maximum value of <scale> is implementation-defined. <scale>
+ shall not be greater than this maximum value.
+
+ 21) NUMERIC specifies the data type exact numeric, with the decimal
+ precision and scale specified by the <precision> and <scale>.
+
+ 22) DECIMAL specifies the data type exact numeric, with the decimal
+ scale specified by the <scale> and the implementation-defined
+ decimal precision equal to or greater than the value of the
+ specified <precision>.
+
+6.26 <numeric value expression>, page 241:
+
+ 1) If the declared type of both operands of a dyadic arithmetic
+ operator is exact numeric, then the declared type of the result is
+ an implementation-defined exact numeric type, with precision and
+ scale determined as follows:
+
+ a) Let S1 and S2 be the scale of the first and second operands
+ respectively.
+ b) The precision of the result of addition and subtraction is
+ implementation-defined, and the scale is the maximum of S1 and S2.
+ c) The precision of the result of multiplication is
+ implementation-defined, and the scale is S1 + S2.
+ d) The precision and scale of the result of division are
+ implementation-defined.
+*/
+
+#include "decimal.h"
+
+#include <limits.h>
+#include <math.h>
+#include <string.h>
+#include <algorithm>
+
+#include "m_ctype.h"
+#include "m_string.h"
+#include "my_byteorder.h"
+#include "my_compiler.h"
+#include "my_dbug.h"
+#include "my_sys.h" /* for my_alloca */
+#include "myisampack.h"
+
+/*
+ Internally decimal numbers are stored base 10^9 (see DIG_BASE below)
+ So one variable of type decimal_digit_t is limited:
+
+ 0 < decimal_digit <= DIG_MAX < DIG_BASE
+
+ in the decimal_t:
+
+ intg is the number of *decimal* digits (NOT number of decimal_digit_t's !)
+ before the point
+ frac - number of decimal digits after the point
+ buf is an array of decimal_digit_t's
+ len is the length of buf (length of allocated space) in decimal_digit_t's,
+ not in bytes
+*/
+typedef decimal_digit_t dec1;
+typedef longlong dec2;
+
+#define DIG_PER_DEC1 9
+#define DIG_MASK 100000000
+#define DIG_BASE 1000000000
+#define DIG_MAX (DIG_BASE - 1)
+#define ROUND_UP(X) (((X) + DIG_PER_DEC1 - 1) / DIG_PER_DEC1)
+static const dec1 powers10[DIG_PER_DEC1 + 1] = {
+ 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000};
+static const int dig2bytes[DIG_PER_DEC1 + 1] = {0, 1, 1, 2, 2, 3, 3, 4, 4, 4};
+static const dec1 frac_max[DIG_PER_DEC1 - 1] = {900000000, 990000000, 999000000,
+ 999900000, 999990000, 999999000,
+ 999999900, 999999990};
+
+static inline dec1 div_by_pow10(dec1 x, int p) {
+ /*
+ GCC can optimize division by a constant to a multiplication and some
+ shifts, which is faster than dividing by a variable, even taking into
+ account the extra cost of the switch. It is also (empirically on a Skylake)
+ faster than storing the magic multiplier constants in a table and doing it
+ ourselves. However, since the code is much bigger, we only use this in
+ a few select places.
+
+ Note the use of unsigned, which is faster for this specific operation.
+ */
+ DBUG_ASSERT(x >= 0);
+ switch (p) {
+ case 0:
+ return static_cast<uint32_t>(x) / 1;
+ case 1:
+ return static_cast<uint32_t>(x) / 10;
+ case 2:
+ return static_cast<uint32_t>(x) / 100;
+ case 3:
+ return static_cast<uint32_t>(x) / 1000;
+ case 4:
+ return static_cast<uint32_t>(x) / 10000;
+ case 5:
+ return static_cast<uint32_t>(x) / 100000;
+ case 6:
+ return static_cast<uint32_t>(x) / 1000000;
+ case 7:
+ return static_cast<uint32_t>(x) / 10000000;
+ case 8:
+ return static_cast<uint32_t>(x) / 100000000;
+ default:
+ DBUG_ASSERT(false);
+ return x / powers10[p];
+ }
+}
+
+static inline dec1 mod_by_pow10(dec1 x, int p) {
+ // See div_by_pow10 for rationale.
+ DBUG_ASSERT(x >= 0);
+ switch (p) {
+ case 1:
+ return static_cast<uint32_t>(x) % 10;
+ case 2:
+ return static_cast<uint32_t>(x) % 100;
+ case 3:
+ return static_cast<uint32_t>(x) % 1000;
+ case 4:
+ return static_cast<uint32_t>(x) % 10000;
+ case 5:
+ return static_cast<uint32_t>(x) % 100000;
+ case 6:
+ return static_cast<uint32_t>(x) % 1000000;
+ case 7:
+ return static_cast<uint32_t>(x) % 10000000;
+ case 8:
+ return static_cast<uint32_t>(x) % 100000000;
+ default:
+ DBUG_ASSERT(false);
+ return x % powers10[p];
+ }
+}
+
+#define sanity(d) DBUG_ASSERT((d)->len > 0)
+
+#define FIX_INTG_FRAC_ERROR(len, intg1, frac1, error) \
+ do { \
+ if (unlikely(intg1 + frac1 > (len))) { \
+ if (unlikely(intg1 > (len))) { \
+ intg1 = (len); \
+ frac1 = 0; \
+ error = E_DEC_OVERFLOW; \
+ } else { \
+ frac1 = (len)-intg1; \
+ error = E_DEC_TRUNCATED; \
+ } \
+ } else \
+ error = E_DEC_OK; \
+ } while (0)
+
+#define ADD(to, from1, from2, carry) /* assume carry <= 1 */ \
+ do { \
+ dec1 a = (from1) + (from2) + (carry); \
+ DBUG_ASSERT((carry) <= 1); \
+ if (((carry) = a >= DIG_BASE)) /* no division here! */ \
+ a -= DIG_BASE; \
+ (to) = a; \
+ } while (0)
+
+#define ADD2(to, from1, from2, carry) \
+ do { \
+ dec2 a = ((dec2)(from1)) + (from2) + (carry); \
+ if (((carry) = a >= DIG_BASE)) a -= DIG_BASE; \
+ if (unlikely(a >= DIG_BASE)) { \
+ a -= DIG_BASE; \
+ carry++; \
+ } \
+ (to) = (dec1)a; \
+ } while (0)
+
+#define SUB(to, from1, from2, carry) /* to=from1-from2 */ \
+ do { \
+ dec1 a = (from1) - (from2) - (carry); \
+ if (((carry) = a < 0)) a += DIG_BASE; \
+ (to) = a; \
+ } while (0)
+
+#define SUB2(to, from1, from2, carry) /* to=from1-from2 */ \
+ do { \
+ dec1 a = (from1) - (from2) - (carry); \
+ if (((carry) = a < 0)) a += DIG_BASE; \
+ if (unlikely(a < 0)) { \
+ a += DIG_BASE; \
+ carry++; \
+ } \
+ (to) = a; \
+ } while (0)
+
+ALWAYS_INLINE static int decimal_bin_size_inline(int precision, int scale);
+
+/*
+ This is a direct loop unrolling of code that used to look like this:
+ for (; *buf_beg < powers10[i--]; start++) ;
+
+ @param i start index
+ @param val value to compare against list of powers of 10
+
+ @retval Number of leading zeroes that can be removed from fraction.
+
+ @note Why unroll? To get rid of lots of compiler warnings [-Warray-bounds]
+ Nice bonus: unrolled code is significantly faster.
+ */
+static inline int count_leading_zeroes(int i, dec1 val) {
+ int ret = 0;
+ switch (i) {
+ /* @note Intentional fallthrough in all case labels */
+ case 9:
+ if (val >= 1000000000) break;
+ ++ret; // Fall through.
+ case 8:
+ if (val >= 100000000) break;
+ ++ret; // Fall through.
+ case 7:
+ if (val >= 10000000) break;
+ ++ret; // Fall through.
+ case 6:
+ if (val >= 1000000) break;
+ ++ret; // Fall through.
+ case 5:
+ if (val >= 100000) break;
+ ++ret; // Fall through.
+ case 4:
+ if (val >= 10000) break;
+ ++ret; // Fall through.
+ case 3:
+ if (val >= 1000) break;
+ ++ret; // Fall through.
+ case 2:
+ if (val >= 100) break;
+ ++ret; // Fall through.
+ case 1:
+ if (val >= 10) break;
+ ++ret; // Fall through.
+ case 0:
+ if (val >= 1) break;
+ ++ret; // Fall through.
+ default: { DBUG_ASSERT(false); }
+ }
+ return ret;
+}
+
+/*
+ This is a direct loop unrolling of code that used to look like this:
+ for (; *buf_end % powers10[i++] == 0; stop--) ;
+
+ @param i start index
+ @param val value to compare against list of powers of 10
+
+ @retval Number of trailing zeroes that can be removed from fraction.
+
+ @note Why unroll? To get rid of lots of compiler warnings [-Warray-bounds]
+ Nice bonus: unrolled code is significantly faster.
+ */
+static inline int count_trailing_zeroes(int i, dec1 val) {
+ DBUG_ASSERT(val >= 0);
+ uint32_t uval = val;
+
+ int ret = 0;
+ switch (i) {
+ /* @note Intentional fallthrough in all case labels */
+ case 0:
+ if ((uval % 1) != 0) break;
+ ++ret; // Fall through.
+ case 1:
+ if ((uval % 10) != 0) break;
+ ++ret; // Fall through.
+ case 2:
+ if ((uval % 100) != 0) break;
+ ++ret; // Fall through.
+ case 3:
+ if ((uval % 1000) != 0) break;
+ ++ret; // Fall through.
+ case 4:
+ if ((uval % 10000) != 0) break;
+ ++ret; // Fall through.
+ case 5:
+ if ((uval % 100000) != 0) break;
+ ++ret; // Fall through.
+ case 6:
+ if ((uval % 1000000) != 0) break;
+ ++ret; // Fall through.
+ case 7:
+ if ((uval % 10000000) != 0) break;
+ ++ret; // Fall through.
+ case 8:
+ if ((uval % 100000000) != 0) break;
+ ++ret; // Fall through.
+ case 9:
+ if ((uval % 1000000000) != 0) break;
+ ++ret; // Fall through.
+ default: { DBUG_ASSERT(false); }
+ }
+ return ret;
+}
+
+/*
+ Get maximum value for given precision and scale
+
+ SYNOPSIS
+ max_decimal()
+ precision/scale - see decimal_bin_size() below
+ to - decimal where where the result will be stored
+ to->buf and to->len must be set.
+*/
+
+void max_decimal(int precision, int frac, decimal_t *to) {
+ int intpart;
+ dec1 *buf = to->buf;
+ DBUG_ASSERT(precision && precision >= frac);
+
+ to->sign = 0;
+ if ((intpart = to->intg = (precision - frac))) {
+ int firstdigits = intpart % DIG_PER_DEC1;
+ if (firstdigits) *buf++ = powers10[firstdigits] - 1; /* get 9 99 999 ... */
+ for (intpart /= DIG_PER_DEC1; intpart; intpart--) *buf++ = DIG_MAX;
+ }
+
+ if ((to->frac = frac)) {
+ int lastdigits = frac % DIG_PER_DEC1;
+ for (frac /= DIG_PER_DEC1; frac; frac--) *buf++ = DIG_MAX;
+ if (lastdigits) *buf = frac_max[lastdigits - 1];
+ }
+}
+
+static inline dec1 *remove_leading_zeroes(const decimal_t *from,
+ int *intg_result) {
+ int intg = from->intg, i;
+ dec1 *buf0 = from->buf;
+ i = ((intg - 1) % DIG_PER_DEC1) + 1;
+ while (intg > 0 && *buf0 == 0) {
+ intg -= i;
+ i = DIG_PER_DEC1;
+ buf0++;
+ }
+ if (intg > 0) {
+ intg -= count_leading_zeroes((intg - 1) % DIG_PER_DEC1, *buf0);
+ DBUG_ASSERT(intg > 0);
+ } else
+ intg = 0;
+ *intg_result = intg;
+ return buf0;
+}
+
+/*
+ Count actual length of fraction part (without ending zeroes)
+
+ SYNOPSIS
+ decimal_actual_fraction()
+ from number for processing
+*/
+
+int decimal_actual_fraction(decimal_t *from) {
+ int frac = from->frac, i;
+ dec1 *buf0 = from->buf + ROUND_UP(from->intg) + ROUND_UP(frac) - 1;
+
+ if (frac == 0) return 0;
+
+ i = ((frac - 1) % DIG_PER_DEC1 + 1);
+ while (frac > 0 && *buf0 == 0) {
+ frac -= i;
+ i = DIG_PER_DEC1;
+ buf0--;
+ }
+ if (frac > 0) {
+ frac -= count_trailing_zeroes(DIG_PER_DEC1 - ((frac - 1) % DIG_PER_DEC1),
+ *buf0);
+ }
+ return frac;
+}
+
+/*
+ Convert decimal to its printable string representation
+
+ SYNOPSIS
+ decimal2string()
+ from - value to convert
+ to - points to buffer where string representation
+ should be stored
+ *to_len - in: size of to buffer (incl. terminating '\0')
+ out: length of the actually written string (excl. '\0')
+ fixed_precision - 0 if representation can be variable length and
+ fixed_decimals will not be checked in this case.
+ Put number as with fixed point position with this
+ number of digits (sign counted and decimal point is
+ counted)
+ fixed_decimals - number digits after point.
+ filler - character to fill gaps in case of fixed_precision > 0
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW
+*/
+
+int decimal2string(const decimal_t *from, char *to, int *to_len,
+ int fixed_precision, int fixed_decimals, char filler) {
+ /* {intg_len, frac_len} output widths; {intg, frac} places in input */
+ int len, intg, frac = from->frac, i, intg_len, frac_len, fill;
+ /* number digits before decimal point */
+ int fixed_intg = (fixed_precision ? (fixed_precision - fixed_decimals) : 0);
+ int error = E_DEC_OK;
+ char *s = to;
+ dec1 *buf, *buf0 = from->buf, tmp;
+
+ DBUG_ASSERT(*to_len >= 2 + from->sign);
+
+ /* removing leading zeroes */
+ buf0 = remove_leading_zeroes(from, &intg);
+ if (unlikely(intg + frac == 0)) {
+ intg = 1;
+ tmp = 0;
+ buf0 = &tmp;
+ }
+
+ if (!(intg_len = fixed_precision ? fixed_intg : intg)) intg_len = 1;
+ frac_len = fixed_precision ? fixed_decimals : frac;
+ len = from->sign + intg_len + MY_TEST(frac) + frac_len;
+ if (fixed_precision) {
+ if (frac > fixed_decimals) {
+ error = E_DEC_TRUNCATED;
+ frac = fixed_decimals;
+ }
+ if (intg > fixed_intg) {
+ error = E_DEC_OVERFLOW;
+ intg = fixed_intg;
+ }
+ } else if (unlikely(len > --*to_len)) /* reserve one byte for \0 */
+ {
+ int j = len - *to_len; /* excess printable chars */
+ error = (frac && j <= frac + 1) ? E_DEC_TRUNCATED : E_DEC_OVERFLOW;
+
+ /*
+ If we need to cut more places than frac is wide, we'll end up
+ dropping the decimal point as well. Account for this.
+ */
+ if (frac && j >= frac + 1) j--;
+
+ if (j > frac) {
+ intg_len = intg -= j - frac;
+ frac = 0;
+ } else
+ frac -= j;
+ frac_len = frac;
+ len = from->sign + intg_len + MY_TEST(frac) + frac_len;
+ }
+ *to_len = len;
+ s[len] = 0;
+
+ if (from->sign) *s++ = '-';
+
+ if (frac) {
+ char *s1 = s + intg_len;
+ fill = frac_len - frac;
+ buf = buf0 + ROUND_UP(intg);
+ *s1++ = '.';
+ for (; frac > 0; frac -= DIG_PER_DEC1) {
+ dec1 x = *buf++;
+ for (i = MY_MIN(frac, DIG_PER_DEC1); i; i--) {
+ dec1 y = x / DIG_MASK;
+ *s1++ = '0' + (uchar)y;
+ x -= y * DIG_MASK;
+ x *= 10;
+ }
+ }
+ for (; fill > 0; fill--) *s1++ = filler;
+ }
+
+ fill = intg_len - intg;
+ if (intg == 0) fill--; /* symbol 0 before digital point */
+ for (; fill > 0; fill--) *s++ = filler;
+ if (intg) {
+ s += intg;
+ for (buf = buf0 + ROUND_UP(intg); intg > 0; intg -= DIG_PER_DEC1) {
+ dec1 x = *--buf;
+ for (i = MY_MIN(intg, DIG_PER_DEC1); i; i--) {
+ dec1 y = x / 10;
+ *--s = '0' + (uchar)(x - y * 10);
+ x = y;
+ }
+ }
+ } else
+ *s = '0';
+
+ return error;
+}
+
+/*
+ Return bounds of decimal digits in the number
+
+ SYNOPSIS
+ digits_bounds()
+ from - decimal number for processing
+ start_result - index (from 0 ) of first decimal digits will
+ be written by this address
+ end_result - index of position just after last decimal digit
+ be written by this address
+*/
+
+static void digits_bounds(decimal_t *from, int *start_result, int *end_result) {
+ int start, stop, i;
+ dec1 *buf_beg = from->buf;
+ dec1 *end = from->buf + ROUND_UP(from->intg) + ROUND_UP(from->frac);
+ dec1 *buf_end = end - 1;
+
+ /* find non-zero digit from number begining */
+ while (buf_beg < end && *buf_beg == 0) buf_beg++;
+
+ if (buf_beg >= end) {
+ /* it is zero */
+ *start_result = *end_result = 0;
+ return;
+ }
+
+ /* find non-zero decimal digit from number begining */
+ if (buf_beg == from->buf && from->intg) {
+ start = DIG_PER_DEC1 - (i = ((from->intg - 1) % DIG_PER_DEC1 + 1));
+ i--;
+ } else {
+ i = DIG_PER_DEC1 - 1;
+ start = (int)((buf_beg - from->buf) * DIG_PER_DEC1);
+ }
+ if (buf_beg < end) start += count_leading_zeroes(i, *buf_beg);
+
+ *start_result = start; /* index of first decimal digit (from 0) */
+
+ /* find non-zero digit at the end */
+ while (buf_end > buf_beg && *buf_end == 0) buf_end--;
+ /* find non-zero decimal digit from the end */
+ if (buf_end == end - 1 && from->frac) {
+ stop = (int)(((buf_end - from->buf) * DIG_PER_DEC1 +
+ (i = ((from->frac - 1) % DIG_PER_DEC1 + 1))));
+ i = DIG_PER_DEC1 - i + 1;
+ } else {
+ stop = (int)((buf_end - from->buf + 1) * DIG_PER_DEC1);
+ i = 1;
+ }
+ stop -= count_trailing_zeroes(i, *buf_end);
+ *end_result = stop; /* index of position after last decimal digit (from 0) */
+}
+
+/*
+ Left shift for alignment of data in buffer
+
+ SYNOPSIS
+ do_mini_left_shift()
+ dec pointer to decimal number which have to be shifted
+ shift number of decimal digits on which it should be shifted
+ beg/end bounds of decimal digits (see digits_bounds())
+
+ NOTE
+ Result fitting in the buffer should be garanted.
+ 'shift' have to be from 1 to DIG_PER_DEC1-1 (inclusive)
+*/
+
+static void do_mini_left_shift(decimal_t *dec, int shift, int beg, int last) {
+ dec1 *from = dec->buf + ROUND_UP(beg + 1) - 1;
+ dec1 *end = dec->buf + ROUND_UP(last) - 1;
+ int c_shift = DIG_PER_DEC1 - shift;
+ DBUG_ASSERT(from >= dec->buf);
+ DBUG_ASSERT(end < dec->buf + dec->len);
+ if (beg % DIG_PER_DEC1 < shift) *(from - 1) = (*from) / powers10[c_shift];
+ for (; from < end; from++)
+ *from = ((*from % powers10[c_shift]) * powers10[shift] +
+ (*(from + 1)) / powers10[c_shift]);
+ *from = (*from % powers10[c_shift]) * powers10[shift];
+}
+
+/*
+ Right shift for alignment of data in buffer
+
+ SYNOPSIS
+ do_mini_left_shift()
+ dec pointer to decimal number which have to be shifted
+ shift number of decimal digits on which it should be shifted
+ beg/end bounds of decimal digits (see digits_bounds())
+
+ NOTE
+ Result fitting in the buffer should be garanted.
+ 'shift' have to be from 1 to DIG_PER_DEC1-1 (inclusive)
+*/
+
+static void do_mini_right_shift(decimal_t *dec, int shift, int beg, int last) {
+ dec1 *from = dec->buf + ROUND_UP(last) - 1;
+ dec1 *end = dec->buf + ROUND_UP(beg + 1) - 1;
+ int c_shift = DIG_PER_DEC1 - shift;
+ DBUG_ASSERT(from < dec->buf + dec->len);
+ DBUG_ASSERT(end >= dec->buf);
+ if (DIG_PER_DEC1 - ((last - 1) % DIG_PER_DEC1 + 1) < shift)
+ *(from + 1) = (*from % powers10[shift]) * powers10[c_shift];
+ for (; from > end; from--)
+ *from = (*from / powers10[shift] +
+ (*(from - 1) % powers10[shift]) * powers10[c_shift]);
+ *from = *from / powers10[shift];
+}
+
+/*
+ Shift of decimal digits in given number (with rounding if it need)
+
+ SYNOPSIS
+ decimal_shift()
+ dec number to be shifted
+ shift number of decimal positions
+ shift > 0 means shift to left shift
+ shift < 0 meand right shift
+ NOTE
+ In fact it is multipling on 10^shift.
+ RETURN
+ E_DEC_OK OK
+ E_DEC_OVERFLOW operation lead to overflow, number is untoched
+ E_DEC_TRUNCATED number was rounded to fit into buffer
+*/
+
+int decimal_shift(decimal_t *dec, int shift) {
+ /* index of first non zero digit (all indexes from 0) */
+ int beg;
+ /* index of position after last decimal digit */
+ int end;
+ /* index of digit position just after point */
+ int point = ROUND_UP(dec->intg) * DIG_PER_DEC1;
+ /* new point position */
+ int new_point = point + shift;
+ /* number of digits in result */
+ int digits_int, digits_frac;
+ /* length of result and new fraction in big digits*/
+ int new_len, new_frac_len;
+ /* return code */
+ int err = E_DEC_OK;
+ int new_front;
+
+ if (shift == 0) return E_DEC_OK;
+
+ digits_bounds(dec, &beg, &end);
+
+ if (beg == end) {
+ decimal_make_zero(dec);
+ return E_DEC_OK;
+ }
+
+ digits_int = new_point - beg;
+ set_if_bigger(digits_int, 0);
+ digits_frac = end - new_point;
+ set_if_bigger(digits_frac, 0);
+
+ if ((new_len = ROUND_UP(digits_int) +
+ (new_frac_len = ROUND_UP(digits_frac))) > dec->len) {
+ int lack = new_len - dec->len;
+ int diff;
+
+ if (new_frac_len < lack)
+ return E_DEC_OVERFLOW; /* lack more then we have in fraction */
+
+ /* cat off fraction part to allow new number to fit in our buffer */
+ err = E_DEC_TRUNCATED;
+ new_frac_len -= lack;
+ diff = digits_frac - (new_frac_len * DIG_PER_DEC1);
+ /* Make rounding method as parameter? */
+ decimal_round(dec, dec, end - point - diff, HALF_UP);
+ end -= diff;
+ digits_frac = new_frac_len * DIG_PER_DEC1;
+
+ if (end <= beg) {
+ /*
+ we lost all digits (they will be shifted out of buffer), so we can
+ just return 0
+ */
+ decimal_make_zero(dec);
+ return E_DEC_TRUNCATED;
+ }
+ }
+
+ if (shift % DIG_PER_DEC1) {
+ int l_mini_shift, r_mini_shift, mini_shift;
+ int do_left;
+ /*
+ Calculate left/right shift to align decimal digits inside our bug
+ digits correctly
+ */
+ if (shift > 0) {
+ l_mini_shift = shift % DIG_PER_DEC1;
+ r_mini_shift = DIG_PER_DEC1 - l_mini_shift;
+ /*
+ It is left shift so prefer left shift, but if we have not place from
+ left, we have to have it from right, because we checked length of
+ result
+ */
+ do_left = l_mini_shift <= beg;
+ DBUG_ASSERT(do_left || (dec->len * DIG_PER_DEC1 - end) >= r_mini_shift);
+ } else {
+ r_mini_shift = (-shift) % DIG_PER_DEC1;
+ l_mini_shift = DIG_PER_DEC1 - r_mini_shift;
+ /* see comment above */
+ do_left = !((dec->len * DIG_PER_DEC1 - end) >= r_mini_shift);
+ DBUG_ASSERT(!do_left || l_mini_shift <= beg);
+ }
+ if (do_left) {
+ do_mini_left_shift(dec, l_mini_shift, beg, end);
+ mini_shift = -l_mini_shift;
+ } else {
+ do_mini_right_shift(dec, r_mini_shift, beg, end);
+ mini_shift = r_mini_shift;
+ }
+ new_point += mini_shift;
+ /*
+ If number is shifted and correctly aligned in buffer we can
+ finish
+ */
+ if (!(shift += mini_shift) && (new_point - digits_int) < DIG_PER_DEC1) {
+ dec->intg = digits_int;
+ dec->frac = digits_frac;
+ return err; /* already shifted as it should be */
+ }
+ beg += mini_shift;
+ end += mini_shift;
+ }
+
+ /* if new 'decimal front' is in first digit, we do not need move digits */
+ if ((new_front = (new_point - digits_int)) >= DIG_PER_DEC1 || new_front < 0) {
+ /* need to move digits */
+ int d_shift;
+ dec1 *to, *barier;
+ if (new_front > 0) {
+ /* move left */
+ d_shift = new_front / DIG_PER_DEC1;
+ to = dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift);
+ barier = dec->buf + (ROUND_UP(end) - 1 - d_shift);
+ DBUG_ASSERT(to >= dec->buf);
+ DBUG_ASSERT(barier + d_shift < dec->buf + dec->len);
+ for (; to <= barier; to++) *to = *(to + d_shift);
+ for (barier += d_shift; to <= barier; to++) *to = 0;
+ d_shift = -d_shift;
+ } else {
+ /* move right */
+ d_shift = (1 - new_front) / DIG_PER_DEC1;
+ to = dec->buf + ROUND_UP(end) - 1 + d_shift;
+ barier = dec->buf + ROUND_UP(beg + 1) - 1 + d_shift;
+ DBUG_ASSERT(to < dec->buf + dec->len);
+ DBUG_ASSERT(barier - d_shift >= dec->buf);
+ for (; to >= barier; to--) *to = *(to - d_shift);
+ for (barier -= d_shift; to >= barier; to--) *to = 0;
+ }
+ d_shift *= DIG_PER_DEC1;
+ beg += d_shift;
+ end += d_shift;
+ new_point += d_shift;
+ }
+
+ /*
+ If there are gaps then fill ren with 0.
+
+ Only one of following 'for' loops will work becouse beg <= end
+ */
+ beg = ROUND_UP(beg + 1) - 1;
+ end = ROUND_UP(end) - 1;
+ DBUG_ASSERT(new_point >= 0);
+
+ /* We don't want negative new_point below */
+ if (new_point != 0) new_point = ROUND_UP(new_point) - 1;
+
+ if (new_point > end) {
+ do {
+ dec->buf[new_point] = 0;
+ } while (--new_point > end);
+ } else {
+ for (; new_point < beg; new_point++) dec->buf[new_point] = 0;
+ }
+ dec->intg = digits_int;
+ dec->frac = digits_frac;
+ return err;
+}
+
+/*
+ Convert string to decimal
+
+ SYNOPSIS
+ string2decimal()
+ from - value to convert. Doesn't have to be \0 terminated!
+ to - decimal where where the result will be stored
+ to->buf and to->len must be set.
+ end - Pointer to pointer to end of string. Will on return be
+ set to the char after the last used character
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW/E_DEC_BAD_NUM/E_DEC_OOM
+ In case of E_DEC_FATAL_ERROR *to is set to decimal zero
+ (to make error handling easier)
+*/
+
+int string2decimal(const char *from, decimal_t *to, char **end) {
+ const char *s = from, *s1, *endp, *end_of_string = *end;
+ int i, intg, frac, error, intg1, frac1;
+ dec1 x, *buf;
+ sanity(to);
+
+ error = E_DEC_BAD_NUM; /* In case of bad number */
+ while (s < end_of_string && my_isspace(&my_charset_latin1, *s)) s++;
+ if (s == end_of_string) goto fatal_error;
+
+ if ((to->sign = (*s == '-')))
+ s++;
+ else if (*s == '+')
+ s++;
+
+ s1 = s;
+ while (s < end_of_string && my_isdigit(&my_charset_latin1, *s)) s++;
+ intg = (int)(s - s1);
+ if (s < end_of_string && *s == '.') {
+ endp = s + 1;
+ while (endp < end_of_string && my_isdigit(&my_charset_latin1, *endp))
+ endp++;
+ frac = (int)(endp - s - 1);
+ } else {
+ frac = 0;
+ endp = s;
+ }
+
+ *end = (char *)endp;
+
+ if (frac + intg == 0) goto fatal_error;
+
+ error = 0;
+
+ intg1 = ROUND_UP(intg);
+ frac1 = ROUND_UP(frac);
+ FIX_INTG_FRAC_ERROR(to->len, intg1, frac1, error);
+ if (unlikely(error)) {
+ frac = frac1 * DIG_PER_DEC1;
+ if (error == E_DEC_OVERFLOW) intg = intg1 * DIG_PER_DEC1;
+ }
+
+ /* Error is guranteed to be set here */
+ to->intg = intg;
+ to->frac = frac;
+
+ buf = to->buf + intg1;
+ s1 = s;
+
+ for (x = 0, i = 0; intg; intg--) {
+ x += (*--s - '0') * powers10[i];
+
+ if (unlikely(++i == DIG_PER_DEC1)) {
+ *--buf = x;
+ x = 0;
+ i = 0;
+ }
+ }
+ if (i) *--buf = x;
+
+ buf = to->buf + intg1;
+ for (x = 0, i = 0; frac; frac--) {
+ x = (*++s1 - '0') + x * 10;
+
+ if (unlikely(++i == DIG_PER_DEC1)) {
+ *buf++ = x;
+ x = 0;
+ i = 0;
+ }
+ }
+ if (i) *buf = x * powers10[DIG_PER_DEC1 - i];
+
+ /* Handle exponent */
+ if (endp + 1 < end_of_string && (*endp == 'e' || *endp == 'E')) {
+ int str_error;
+ longlong exponent =
+ my_strtoll10(endp + 1, (char **)&end_of_string, &str_error);
+
+ if (end_of_string != endp + 1) /* If at least one digit */
+ {
+ *end = (char *)end_of_string;
+ if (str_error > 0) {
+ error = E_DEC_BAD_NUM;
+ goto fatal_error;
+ }
+ if (exponent > INT_MAX / 2 || (str_error == 0 && exponent < 0)) {
+ error = E_DEC_OVERFLOW;
+ goto fatal_error;
+ }
+ if (exponent < INT_MIN / 2 && error != E_DEC_OVERFLOW) {
+ error = E_DEC_TRUNCATED;
+ goto fatal_error;
+ }
+ if (error != E_DEC_OVERFLOW) error = decimal_shift(to, (int)exponent);
+ }
+ }
+ /* Avoid returning negative zero, cfr. decimal_cmp() */
+ if (to->sign && decimal_is_zero(to)) to->sign = false;
+ return error;
+
+fatal_error:
+ decimal_make_zero(to);
+ return error;
+}
+
+/*
+ Convert decimal to double
+
+ SYNOPSIS
+ decimal2double()
+ from - value to convert
+ to - result will be stored there
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_OVERFLOW/E_DEC_TRUNCATED
+*/
+
+int decimal2double(const decimal_t *from, double *to) {
+ char strbuf[FLOATING_POINT_BUFFER], *end;
+ int len = sizeof(strbuf);
+ int rc, error;
+
+ rc = decimal2string(from, strbuf, &len, 0, 0, 0);
+ end = strbuf + len;
+
+ DBUG_PRINT("info", ("interm.: %s", strbuf));
+
+ *to = my_strtod(strbuf, &end, &error);
+
+ DBUG_PRINT("info", ("result: %f", *to));
+
+ return (rc != E_DEC_OK) ? rc : (error ? E_DEC_OVERFLOW : E_DEC_OK);
+}
+
+/*
+ Convert double to decimal
+
+ SYNOPSIS
+ double2decimal()
+ from - value to convert
+ to - result will be stored there
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_OVERFLOW/E_DEC_TRUNCATED
+*/
+
+int double2decimal(double from, decimal_t *to) {
+ char buff[FLOATING_POINT_BUFFER], *end;
+ int res;
+ DBUG_ENTER("double2decimal");
+ end = buff +
+ my_gcvt(from, MY_GCVT_ARG_DOUBLE, (int)sizeof(buff) - 1, buff, NULL);
+ res = string2decimal(buff, to, &end);
+ DBUG_PRINT("exit", ("res: %d", res));
+ DBUG_RETURN(res);
+}
+
+static int ull2dec(ulonglong from, decimal_t *to) {
+ int intg1;
+ int error = E_DEC_OK;
+ ulonglong x = from;
+ dec1 *buf;
+
+ sanity(to);
+
+ if (from == 0)
+ intg1 = 1;
+ else {
+ /* Count the number of decimal_digit_t's we need. */
+ for (intg1 = 0; from != 0; intg1++, from /= DIG_BASE)
+ ;
+ }
+ if (unlikely(intg1 > to->len)) {
+ intg1 = to->len;
+ error = E_DEC_OVERFLOW;
+ }
+ to->frac = 0;
+ to->intg = intg1 * DIG_PER_DEC1;
+
+ for (buf = to->buf + intg1; intg1; intg1--) {
+ ulonglong y = x / DIG_BASE;
+ *--buf = (dec1)(x - y * DIG_BASE);
+ x = y;
+ }
+ return error;
+}
+
+int ulonglong2decimal(ulonglong from, decimal_t *to) {
+ to->sign = 0;
+ return ull2dec(from, to);
+}
+
+int longlong2decimal(longlong from, decimal_t *to) {
+ if ((to->sign = from < 0))
+ return ull2dec(from == LLONG_MIN ? static_cast<ulonglong>(from) : -from,
+ to);
+ return ull2dec(from, to);
+}
+
+int decimal2ulonglong(decimal_t *from, ulonglong *to) {
+ dec1 *buf = from->buf;
+ ulonglong x = 0;
+ int intg, frac;
+
+ if (from->sign) {
+ *to = 0ULL;
+ return E_DEC_OVERFLOW;
+ }
+
+ for (intg = from->intg; intg > 0; intg -= DIG_PER_DEC1) {
+ ulonglong y = x;
+ x = x * DIG_BASE + *buf++;
+ if (unlikely(y > ((ulonglong)ULLONG_MAX / DIG_BASE) || x < y)) {
+ *to = ULLONG_MAX;
+ return E_DEC_OVERFLOW;
+ }
+ }
+ *to = x;
+ for (frac = from->frac; unlikely(frac > 0); frac -= DIG_PER_DEC1)
+ if (*buf++) return E_DEC_TRUNCATED;
+ return E_DEC_OK;
+}
+
+int decimal2longlong(decimal_t *from, longlong *to) {
+ dec1 *buf = from->buf;
+ longlong x = 0;
+ int intg, frac;
+
+ for (intg = from->intg; intg > 0; intg -= DIG_PER_DEC1) {
+ /*
+ Attention: trick!
+ we're calculating -|from| instead of |from| here
+ because |LLONG_MIN| > LLONG_MAX
+ so we can convert -9223372036854775808 correctly
+ */
+ if (unlikely(x < (LLONG_MIN / DIG_BASE))) {
+ /*
+ the decimal is bigger than any possible integer
+ return border integer depending on the sign
+ */
+ *to = from->sign ? LLONG_MIN : LLONG_MAX;
+ return E_DEC_OVERFLOW;
+ }
+ x = x * DIG_BASE;
+ const longlong digit = *buf++;
+ if (unlikely(x < LLONG_MIN + digit)) {
+ /*
+ the decimal is bigger than any possible integer
+ return border integer depending on the sign
+ */
+ *to = from->sign ? LLONG_MIN : LLONG_MAX;
+ return E_DEC_OVERFLOW;
+ }
+ x = x - digit;
+ }
+ /* boundary case: 9223372036854775808 */
+ if (unlikely(from->sign == 0 && x == LLONG_MIN)) {
+ *to = LLONG_MAX;
+ return E_DEC_OVERFLOW;
+ }
+
+ *to = from->sign ? x : -x;
+ for (frac = from->frac; unlikely(frac > 0); frac -= DIG_PER_DEC1)
+ if (*buf++) return E_DEC_TRUNCATED;
+ return E_DEC_OK;
+}
+
+#define LLDIV_MIN -1000000000000000000LL
+#define LLDIV_MAX 1000000000000000000LL
+
+/**
+ Convert decimal value to lldiv_t value.
+ @param from The decimal value to convert from.
+ @param [out] to The lldiv_t variable to convert to.
+ @return 0 on success, error code on error.
+*/
+int decimal2lldiv_t(const decimal_t *from, lldiv_t *to) {
+ int int_part = ROUND_UP(from->intg);
+ int frac_part = ROUND_UP(from->frac);
+ if (int_part > 2) {
+ to->rem = 0;
+ to->quot = from->sign ? LLDIV_MIN : LLDIV_MAX;
+ return E_DEC_OVERFLOW;
+ }
+ if (int_part == 2)
+ to->quot = ((longlong)from->buf[0]) * DIG_BASE + from->buf[1];
+ else if (int_part == 1)
+ to->quot = from->buf[0];
+ else
+ to->quot = 0;
+ to->rem = frac_part ? from->buf[int_part] : 0;
+ if (from->sign) {
+ to->quot = -to->quot;
+ to->rem = -to->rem;
+ }
+ return 0;
+}
+
+/**
+ Convert double value to lldiv_t valie.
+ @param nr The double value to convert from.
+ @param [out] lld The lldit_t variable to convert to.
+ @return 0 on success, error code on error.
+
+ Integer part goes into lld.quot.
+ Fractional part multiplied to 1000000000 (10^9) goes to lld.rem.
+ Typically used in datetime calculations to split seconds
+ and nanoseconds.
+*/
+int double2lldiv_t(double nr, lldiv_t *lld) {
+ if (nr > LLDIV_MAX) {
+ lld->quot = LLDIV_MAX;
+ lld->rem = 0;
+ return E_DEC_OVERFLOW;
+ } else if (nr < LLDIV_MIN) {
+ lld->quot = LLDIV_MIN;
+ lld->rem = 0;
+ return E_DEC_OVERFLOW;
+ }
+ /* Truncate fractional part toward zero and store into "quot" */
+ lld->quot = (longlong)(nr > 0 ? floor(nr) : ceil(nr));
+ /* Multiply reminder to 10^9 and store into "rem" */
+ lld->rem = (longlong)rint((nr - (double)lld->quot) * 1000000000);
+ /*
+ Sometimes the expression "(double) 0.999999999xxx * (double) 10e9"
+ gives 1,000,000,000 instead of 999,999,999 due to lack of double precision.
+ The callers do not expect lld->rem to be greater than 999,999,999.
+ Let's catch this corner case and put the "nanounit" (e.g. nanosecond)
+ value in ldd->rem back into the valid range.
+ */
+ if (lld->rem > 999999999LL)
+ lld->rem = 999999999LL;
+ else if (lld->rem < -999999999LL)
+ lld->rem = -999999999LL;
+ return E_DEC_OK;
+}
+
+/*
+ Convert decimal to its binary fixed-length representation
+ two representations of the same length can be compared with memcmp
+ with the correct -1/0/+1 result
+
+ SYNOPSIS
+ decimal2bin()
+ from - value to convert
+ to - points to buffer where string representation should be stored
+ precision/scale - see decimal_bin_size() below
+
+ NOTE
+ the buffer is assumed to be of the size decimal_bin_size(precision, scale)
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW
+
+ DESCRIPTION
+ for storage decimal numbers are converted to the "binary" format.
+
+ This format has the following properties:
+ 1. length of the binary representation depends on the {precision, scale}
+ as provided by the caller and NOT on the intg/frac of the decimal to
+ convert.
+ 2. binary representations of the same {precision, scale} can be compared
+ with memcmp - with the same result as decimal_cmp() of the original
+ decimals (not taking into account possible precision loss during
+ conversion).
+
+ This binary format is as follows:
+ 1. First the number is converted to have a requested precision and scale.
+ 2. Every full DIG_PER_DEC1 digits of intg part are stored in 4 bytes
+ as is
+ 3. The first intg % DIG_PER_DEC1 digits are stored in the reduced
+ number of bytes (enough bytes to store this number of digits -
+ see dig2bytes)
+ 4. same for frac - full decimal_digit_t's are stored as is,
+ the last frac % DIG_PER_DEC1 digits - in the reduced number of bytes.
+ 5. If the number is negative - every byte is inversed.
+ 5. The very first bit of the resulting byte array is inverted (because
+ memcmp compares unsigned bytes, see property 2 above)
+
+ Example:
+
+ 1234567890.1234
+
+ internally is represented as 3 decimal_digit_t's
+
+ 1 234567890 123400000
+
+ (assuming we want a binary representation with precision=14, scale=4)
+ in hex it's
+
+ 00-00-00-01 0D-FB-38-D2 07-5A-EF-40
+
+ now, middle decimal_digit_t is full - it stores 9 decimal digits. It goes
+ into binary representation as is:
+
+
+ ........... 0D-FB-38-D2 ............
+
+ First decimal_digit_t has only one decimal digit. We can store one digit in
+ one byte, no need to waste four:
+
+ 01 0D-FB-38-D2 ............
+
+ now, last digit. It's 123400000. We can store 1234 in two bytes:
+
+ 01 0D-FB-38-D2 04-D2
+
+ So, we've packed 12 bytes number in 7 bytes.
+ And now we invert the highest bit to get the final result:
+
+ 81 0D FB 38 D2 04 D2
+
+ And for -1234567890.1234 it would be
+
+ 7E F2 04 C7 2D FB 2D
+*/
+int decimal2bin(decimal_t *from, uchar *to, int precision, int frac) {
+ dec1 mask = from->sign ? -1 : 0, *buf1 = from->buf, *stop1;
+ int error = E_DEC_OK, intg = precision - frac, isize1, intg1, intg1x,
+ from_intg, intg0 = intg / DIG_PER_DEC1, frac0 = frac / DIG_PER_DEC1,
+ intg0x = intg - intg0 * DIG_PER_DEC1,
+ frac0x = frac - frac0 * DIG_PER_DEC1, frac1 = from->frac / DIG_PER_DEC1,
+ frac1x = from->frac - frac1 * DIG_PER_DEC1,
+ isize0 = intg0 * sizeof(dec1) + dig2bytes[intg0x],
+ fsize0 = frac0 * sizeof(dec1) + dig2bytes[frac0x],
+ fsize1 = frac1 * sizeof(dec1) + dig2bytes[frac1x];
+ const int orig_isize0 = isize0;
+ const int orig_fsize0 = fsize0;
+ uchar *orig_to = to;
+
+ buf1 = remove_leading_zeroes(from, &from_intg);
+
+ if (unlikely(from_intg + fsize1 == 0)) {
+ mask = 0; /* just in case */
+ intg = 1;
+ buf1 = &mask;
+ }
+
+ intg1 = from_intg / DIG_PER_DEC1;
+ intg1x = from_intg - intg1 * DIG_PER_DEC1;
+ isize1 = intg1 * sizeof(dec1) + dig2bytes[intg1x];
+
+ if (intg < from_intg) {
+ buf1 += intg1 - intg0 + (intg1x > 0) - (intg0x > 0);
+ intg1 = intg0;
+ intg1x = intg0x;
+ error = E_DEC_OVERFLOW;
+ } else if (isize0 > isize1) {
+ while (isize0-- > isize1) *to++ = (char)mask;
+ }
+ if (fsize0 < fsize1) {
+ frac1 = frac0;
+ frac1x = frac0x;
+ error = E_DEC_TRUNCATED;
+ } else if (fsize0 > fsize1 && frac1x) {
+ if (frac0 == frac1) {
+ frac1x = frac0x;
+ fsize0 = fsize1;
+ } else {
+ frac1++;
+ frac1x = 0;
+ }
+ }
+
+ /* intg1x part */
+ if (intg1x) {
+ int i = dig2bytes[intg1x];
+ dec1 x = mod_by_pow10(*buf1++, intg1x) ^ mask;
+ switch (i) {
+ case 1:
+ mi_int1store(to, x);
+ break;
+ case 2:
+ mi_int2store(to, x);
+ break;
+ case 3:
+ mi_int3store(to, x);
+ break;
+ case 4:
+ mi_int4store(to, x);
+ break;
+ default:
+ DBUG_ASSERT(0);
+ }
+ to += i;
+ }
+
+ /* intg1+frac1 part */
+ for (stop1 = buf1 + intg1 + frac1; buf1 < stop1; to += sizeof(dec1)) {
+ dec1 x = *buf1++ ^ mask;
+ DBUG_ASSERT(sizeof(dec1) == 4);
+ mi_int4store(to, x);
+ }
+
+ /* frac1x part */
+ if (frac1x) {
+ dec1 x;
+ int i = dig2bytes[frac1x], lim = (frac1 < frac0 ? DIG_PER_DEC1 : frac0x);
+ while (frac1x < lim && dig2bytes[frac1x] == i) frac1x++;
+ x = div_by_pow10(*buf1, DIG_PER_DEC1 - frac1x) ^ mask;
+ switch (i) {
+ case 1:
+ mi_int1store(to, x);
+ break;
+ case 2:
+ mi_int2store(to, x);
+ break;
+ case 3:
+ mi_int3store(to, x);
+ break;
+ case 4:
+ mi_int4store(to, x);
+ break;
+ default:
+ DBUG_ASSERT(0);
+ }
+ to += i;
+ }
+ if (fsize0 > fsize1) {
+ uchar *to_end = orig_to + orig_fsize0 + orig_isize0;
+
+ while (fsize0-- > fsize1 && to < to_end) *to++ = (uchar)mask;
+ }
+ orig_to[0] ^= 0x80;
+
+ /* Check that we have written the whole decimal and nothing more */
+ DBUG_ASSERT(to == orig_to + orig_fsize0 + orig_isize0);
+ return error;
+}
+
+/*
+ Restores decimal from its binary fixed-length representation
+
+ SYNOPSIS
+ bin2decimal()
+ from - value to convert
+ to - result
+ precision/scale - see decimal_bin_size() below
+
+ NOTE
+ see decimal2bin()
+ the buffer is assumed to be of the size decimal_bin_size(precision, scale)
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW
+*/
+
+int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale) {
+ int error = E_DEC_OK, intg = precision - scale, intg0 = intg / DIG_PER_DEC1,
+ frac0 = scale / DIG_PER_DEC1, intg0x = intg - intg0 * DIG_PER_DEC1,
+ frac0x = scale - frac0 * DIG_PER_DEC1, intg1 = intg0 + (intg0x > 0),
+ frac1 = frac0 + (frac0x > 0);
+ dec1 *buf = to->buf, mask = (*from & 0x80) ? 0 : -1;
+ const uchar *stop;
+ uchar *d_copy;
+ int bin_size = decimal_bin_size_inline(precision, scale);
+
+ sanity(to);
+ d_copy = (uchar *)my_alloca(bin_size);
+ memcpy(d_copy, from, bin_size);
+ d_copy[0] ^= 0x80;
+ from = d_copy;
+
+ FIX_INTG_FRAC_ERROR(to->len, intg1, frac1, error);
+ if (unlikely(error)) {
+ if (intg1 < intg0 + (intg0x > 0)) {
+ from += dig2bytes[intg0x] + sizeof(dec1) * (intg0 - intg1);
+ frac0 = frac0x = intg0x = 0;
+ intg0 = intg1;
+ } else {
+ frac0x = 0;
+ frac0 = frac1;
+ }
+ }
+
+ to->sign = (mask != 0);
+ to->intg = intg0 * DIG_PER_DEC1 + intg0x;
+ to->frac = frac0 * DIG_PER_DEC1 + frac0x;
+
+ if (intg0x) {
+ int i = dig2bytes[intg0x];
+ dec1 x = 0;
+ switch (i) {
+ case 1:
+ x = mi_sint1korr(from);
+ break;
+ case 2:
+ x = mi_sint2korr(from);
+ break;
+ case 3:
+ x = mi_sint3korr(from);
+ break;
+ case 4:
+ x = mi_sint4korr(from);
+ break;
+ default:
+ DBUG_ASSERT(0);
+ }
+ from += i;
+ *buf = x ^ mask;
+ if (((ulonglong)*buf) >= (ulonglong)powers10[intg0x + 1]) goto err;
+ if (buf > to->buf || *buf != 0)
+ buf++;
+ else
+ to->intg -= intg0x;
+ }
+ for (stop = from + intg0 * sizeof(dec1); from < stop; from += sizeof(dec1)) {
+ DBUG_ASSERT(sizeof(dec1) == 4);
+ *buf = mi_sint4korr(from) ^ mask;
+ if (((uint32)*buf) > DIG_MAX) goto err;
+ if (buf > to->buf || *buf != 0)
+ buf++;
+ else
+ to->intg -= DIG_PER_DEC1;
+ }
+ DBUG_ASSERT(to->intg >= 0);
+ for (stop = from + frac0 * sizeof(dec1); from < stop; from += sizeof(dec1)) {
+ DBUG_ASSERT(sizeof(dec1) == 4);
+ *buf = mi_sint4korr(from) ^ mask;
+ if (((uint32)*buf) > DIG_MAX) goto err;
+ buf++;
+ }
+ if (frac0x) {
+ int i = dig2bytes[frac0x];
+ dec1 x = 0;
+ switch (i) {
+ case 1:
+ x = mi_sint1korr(from);
+ break;
+ case 2:
+ x = mi_sint2korr(from);
+ break;
+ case 3:
+ x = mi_sint3korr(from);
+ break;
+ case 4:
+ x = mi_sint4korr(from);
+ break;
+ default:
+ DBUG_ASSERT(0);
+ }
+ *buf = (x ^ mask) * powers10[DIG_PER_DEC1 - frac0x];
+ if (((uint32)*buf) > DIG_MAX) goto err;
+ buf++;
+ }
+
+ /*
+ No digits? We have read the number zero, of unspecified precision.
+ Make it a proper zero, with non-zero precision.
+ */
+ if (to->intg == 0 && to->frac == 0) decimal_make_zero(to);
+ return error;
+
+err:
+ decimal_make_zero(to);
+ return (E_DEC_BAD_NUM);
+}
+
+/*
+ Returns the size of array to hold a decimal with given precision and scale
+
+ RETURN VALUE
+ size in dec1
+ (multiply by sizeof(dec1) to get the size if bytes)
+*/
+
+int decimal_size(int precision, int scale) {
+ DBUG_ASSERT(scale >= 0 && precision > 0 && scale <= precision);
+ return ROUND_UP(precision - scale) + ROUND_UP(scale);
+}
+
+/*
+ Returns the size of array to hold a binary representation of a decimal
+
+ RETURN VALUE
+ size in bytes
+*/
+ALWAYS_INLINE static int decimal_bin_size_inline(int precision, int scale) {
+ int intg = precision - scale, intg0 = intg / DIG_PER_DEC1,
+ frac0 = scale / DIG_PER_DEC1, intg0x = intg - intg0 * DIG_PER_DEC1,
+ frac0x = scale - frac0 * DIG_PER_DEC1;
+
+ DBUG_ASSERT(scale >= 0 && precision > 0 && scale <= precision);
+ DBUG_ASSERT(intg0x >= 0);
+ DBUG_ASSERT(intg0x <= DIG_PER_DEC1);
+ DBUG_ASSERT(frac0x >= 0);
+ DBUG_ASSERT(frac0x <= DIG_PER_DEC1);
+ return intg0 * sizeof(dec1) + dig2bytes[intg0x] + frac0 * sizeof(dec1) +
+ dig2bytes[frac0x];
+}
+
+int decimal_bin_size(int precision, int scale) {
+ return decimal_bin_size_inline(precision, scale);
+}
+
+/*
+ Rounds the decimal to "scale" digits
+
+ SYNOPSIS
+ decimal_round()
+ from - decimal to round,
+ to - result buffer. from==to is allowed
+ scale - to what position to round. can be negative!
+ mode - round to nearest even or truncate
+
+ NOTES
+ scale can be negative !
+ one TRUNCATED error (line XXX below) isn't treated very logical :(
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED
+*/
+
+int decimal_round(const decimal_t *from, decimal_t *to, int scale,
+ decimal_round_mode mode) {
+ int frac0 = scale > 0 ? ROUND_UP(scale) : (scale + 1) / DIG_PER_DEC1,
+ frac1 = ROUND_UP(from->frac), round_digit = 0,
+ intg0 = ROUND_UP(from->intg), error = E_DEC_OK, len = to->len;
+
+ dec1 *buf0 = from->buf, *buf1 = to->buf, x, y, carry = 0;
+ int first_dig;
+
+ sanity(to);
+
+ switch (mode) {
+ case HALF_UP:
+ case HALF_EVEN:
+ round_digit = 5;
+ break;
+ case CEILING:
+ round_digit = from->sign ? 10 : 0;
+ break;
+ case FLOOR:
+ round_digit = from->sign ? 0 : 10;
+ break;
+ case TRUNCATE:
+ round_digit = 10;
+ break;
+ default:
+ DBUG_ASSERT(0);
+ }
+
+ /*
+ For my_decimal we always use len == DECIMAL_BUFF_LENGTH == 9
+ For internal testing here (ifdef MAIN) we always use len == 100/4
+ */
+ DBUG_ASSERT(from->len == to->len);
+
+ if (unlikely(frac0 + intg0 > len)) {
+ frac0 = len - intg0;
+ scale = frac0 * DIG_PER_DEC1;
+ error = E_DEC_TRUNCATED;
+ }
+
+ if (scale + from->intg < 0) {
+ decimal_make_zero(to);
+ return E_DEC_OK;
+ }
+
+ if (to != from) {
+ dec1 *p0 = buf0 + intg0 + MY_MAX(frac1, frac0);
+ dec1 *p1 = buf1 + intg0 + MY_MAX(frac1, frac0);
+
+ DBUG_ASSERT(p0 - buf0 <= len);
+ DBUG_ASSERT(p1 - buf1 <= len);
+
+ while (buf0 < p0) *(--p1) = *(--p0);
+
+ buf0 = to->buf;
+ buf1 = to->buf;
+ to->sign = from->sign;
+ to->intg = MY_MIN(intg0, len) * DIG_PER_DEC1;
+ }
+
+ if (frac0 > frac1) {
+ buf1 += intg0 + frac1;
+ while (frac0-- > frac1) *buf1++ = 0;
+ goto done;
+ }
+
+ if (scale >= from->frac) goto done; /* nothing to do */
+
+ buf0 += intg0 + frac0 - 1;
+ buf1 += intg0 + frac0 - 1;
+ if (scale == frac0 * DIG_PER_DEC1) {
+ int do_inc = false;
+ DBUG_ASSERT(frac0 + intg0 >= 0);
+ switch (round_digit) {
+ case 0: {
+ dec1 *p0 = buf0 + (frac1 - frac0);
+ for (; p0 > buf0; p0--) {
+ if (*p0) {
+ do_inc = true;
+ break;
+ }
+ }
+ break;
+ }
+ case 5: {
+ x = buf0[1] / DIG_MASK;
+ do_inc =
+ (x > 5) ||
+ ((x == 5) && (mode == HALF_UP || (frac0 + intg0 > 0 && *buf0 & 1)));
+ break;
+ }
+ default:
+ break;
+ }
+ if (do_inc) {
+ if (frac0 + intg0 > 0)
+ (*buf1)++;
+ else
+ *(++buf1) = DIG_BASE;
+ } else if (frac0 + intg0 == 0) {
+ decimal_make_zero(to);
+ return E_DEC_OK;
+ }
+ } else {
+ /* TODO - fix this code as it won't work for CEILING mode */
+ int pos = frac0 * DIG_PER_DEC1 - scale - 1;
+ DBUG_ASSERT(frac0 + intg0 > 0);
+ x = *buf1 / powers10[pos];
+ y = x % 10;
+ if (y > round_digit ||
+ (round_digit == 5 && y == 5 && (mode == HALF_UP || (x / 10) & 1)))
+ x += 10;
+ *buf1 = powers10[pos] * (x - y);
+ }
+ /*
+ In case we're rounding e.g. 1.5e9 to 2.0e9, the decimal_digit_t's inside
+ the buffer are as follows.
+
+ Before <1, 5e8>
+ After <2, 5e8>
+
+ Hence we need to set the 2nd field to 0.
+ The same holds if we round 1.5e-9 to 2e-9.
+ */
+ if (frac0 < frac1) {
+ dec1 *buf = to->buf + ((scale == 0 && intg0 == 0) ? 1 : intg0 + frac0);
+ dec1 *end = to->buf + len;
+
+ while (buf < end) *buf++ = 0;
+ }
+ if (*buf1 >= DIG_BASE) {
+ carry = 1;
+ *buf1 -= DIG_BASE;
+ while (carry && --buf1 >= to->buf) ADD(*buf1, *buf1, 0, carry);
+ if (unlikely(carry)) {
+ /* shifting the number to create space for new digit */
+ if (frac0 + intg0 >= len) {
+ frac0--;
+ scale = frac0 * DIG_PER_DEC1;
+ error = E_DEC_TRUNCATED; /* XXX */
+ }
+ for (buf1 = to->buf + intg0 + MY_MAX(frac0, 0); buf1 > to->buf; buf1--) {
+ /* Avoid out-of-bounds write. */
+ if (buf1 < to->buf + len)
+ buf1[0] = buf1[-1];
+ else
+ error = E_DEC_OVERFLOW;
+ }
+ *buf1 = 1;
+ /* We cannot have more than 9 * 9 = 81 digits. */
+ if (to->intg < len * DIG_PER_DEC1)
+ to->intg++;
+ else
+ error = E_DEC_OVERFLOW;
+ }
+ } else {
+ for (;;) {
+ if (likely(*buf1)) break;
+ if (buf1-- == to->buf) {
+ /* making 'zero' with the proper scale */
+ dec1 *p0 = to->buf + frac0 + 1;
+ to->intg = 1;
+ to->frac = MY_MAX(scale, 0);
+ to->sign = 0;
+ for (buf1 = to->buf; buf1 < p0; buf1++) *buf1 = 0;
+ return E_DEC_OK;
+ }
+ }
+ }
+
+ /* Here we check 999.9 -> 1000 case when we need to increase intg */
+ first_dig = to->intg % DIG_PER_DEC1;
+ if (first_dig && (*buf1 >= powers10[first_dig])) to->intg++;
+
+ if (scale < 0) scale = 0;
+
+done:
+ DBUG_ASSERT(to->intg <= (len * DIG_PER_DEC1));
+ to->frac = scale;
+ return error;
+}
+
+/*
+ Returns the size of the result of the operation
+
+ SYNOPSIS
+ decimal_result_size()
+ from1 - operand of the unary operation or first operand of the
+ binary operation
+ from2 - second operand of the binary operation
+ op - operation. one char '+', '-', '*', '/' are allowed
+ others may be added later
+ param - extra param to the operation. unused for '+', '-', '*'
+ scale increment for '/'
+
+ NOTE
+ returned valued may be larger than the actual buffer requred
+ in the operation, as decimal_result_size, by design, operates on
+ precision/scale values only and not on the actual decimal number
+
+ RETURN VALUE
+ size of to->buf array in dec1 elements. to get size in bytes
+ multiply by sizeof(dec1)
+*/
+
+int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,
+ int param) {
+ switch (op) {
+ case '-':
+ return ROUND_UP(MY_MAX(from1->intg, from2->intg)) +
+ ROUND_UP(MY_MAX(from1->frac, from2->frac));
+ case '+':
+ return ROUND_UP(MY_MAX(from1->intg, from2->intg) + 1) +
+ ROUND_UP(MY_MAX(from1->frac, from2->frac));
+ case '*':
+ return ROUND_UP(from1->intg + from2->intg) + ROUND_UP(from1->frac) +
+ ROUND_UP(from2->frac);
+ case '/':
+ return ROUND_UP(from1->intg + from2->intg + 1 + from1->frac +
+ from2->frac + param);
+ default:
+ DBUG_ASSERT(0);
+ }
+ return -1; /* shut up the warning */
+}
+
+static int do_add(const decimal_t *from1, const decimal_t *from2,
+ decimal_t *to) {
+ int intg1 = ROUND_UP(from1->intg), intg2 = ROUND_UP(from2->intg),
+ frac1 = ROUND_UP(from1->frac), frac2 = ROUND_UP(from2->frac),
+ frac0 = MY_MAX(frac1, frac2), intg0 = MY_MAX(intg1, intg2), error;
+ dec1 *buf1, *buf2, *buf0, *stop, *stop2, x, carry;
+
+ sanity(to);
+
+ /* is there a need for extra word because of carry ? */
+ x = intg1 > intg2
+ ? from1->buf[0]
+ : intg2 > intg1 ? from2->buf[0] : from1->buf[0] + from2->buf[0];
+ if (unlikely(x > DIG_MAX - 1)) /* yes, there is */
+ {
+ intg0++;
+ to->buf[0] = 0; /* safety */
+ }
+
+ FIX_INTG_FRAC_ERROR(to->len, intg0, frac0, error);
+ if (unlikely(error == E_DEC_OVERFLOW)) {
+ max_decimal(to->len * DIG_PER_DEC1, 0, to);
+ return error;
+ }
+
+ buf0 = to->buf + intg0 + frac0;
+
+ to->sign = from1->sign;
+ to->frac = MY_MAX(from1->frac, from2->frac);
+ to->intg = intg0 * DIG_PER_DEC1;
+ if (unlikely(error)) {
+ set_if_smaller(to->frac, frac0 * DIG_PER_DEC1);
+ set_if_smaller(frac1, frac0);
+ set_if_smaller(frac2, frac0);
+ set_if_smaller(intg1, intg0);
+ set_if_smaller(intg2, intg0);
+ }
+
+ /* part 1 - max(frac) ... min (frac) */
+ if (frac1 > frac2) {
+ buf1 = from1->buf + intg1 + frac1;
+ stop = from1->buf + intg1 + frac2;
+ buf2 = from2->buf + intg2 + frac2;
+ stop2 = from1->buf + (intg1 > intg2 ? intg1 - intg2 : 0);
+ } else {
+ buf1 = from2->buf + intg2 + frac2;
+ stop = from2->buf + intg2 + frac1;
+ buf2 = from1->buf + intg1 + frac1;
+ stop2 = from2->buf + (intg2 > intg1 ? intg2 - intg1 : 0);
+ }
+ while (buf1 > stop) *--buf0 = *--buf1;
+
+ /* part 2 - min(frac) ... min(intg) */
+ carry = 0;
+ while (buf1 > stop2) {
+ ADD(*--buf0, *--buf1, *--buf2, carry);
+ }
+
+ /* part 3 - min(intg) ... max(intg) */
+ buf1 = intg1 > intg2 ? ((stop = from1->buf) + intg1 - intg2)
+ : ((stop = from2->buf) + intg2 - intg1);
+ while (buf1 > stop) {
+ ADD(*--buf0, *--buf1, 0, carry);
+ }
+
+ if (unlikely(carry)) *--buf0 = 1;
+ DBUG_ASSERT(buf0 == to->buf || buf0 == to->buf + 1);
+
+ return error;
+}
+
+/* to=from1-from2.
+ if to==0, return -1/0/+1 - the result of the comparison */
+static int do_sub(const decimal_t *from1, const decimal_t *from2,
+ decimal_t *to) {
+ int intg1 = ROUND_UP(from1->intg), intg2 = ROUND_UP(from2->intg),
+ frac1 = ROUND_UP(from1->frac), frac2 = ROUND_UP(from2->frac);
+ int frac0 = MY_MAX(frac1, frac2), error;
+ dec1 *buf1, *buf2, *buf0, *stop1, *stop2, *start1, *start2, carry = 0;
+
+ /* let carry:=1 if from2 > from1 */
+ start1 = buf1 = from1->buf;
+ stop1 = buf1 + intg1;
+ start2 = buf2 = from2->buf;
+ stop2 = buf2 + intg2;
+ if (unlikely(*buf1 == 0)) {
+ while (buf1 < stop1 && *buf1 == 0) buf1++;
+ start1 = buf1;
+ intg1 = (int)(stop1 - buf1);
+ }
+ if (unlikely(*buf2 == 0)) {
+ while (buf2 < stop2 && *buf2 == 0) buf2++;
+ start2 = buf2;
+ intg2 = (int)(stop2 - buf2);
+ }
+ if (intg2 > intg1)
+ carry = 1;
+ else if (intg2 == intg1) {
+ dec1 *end1 = stop1 + (frac1 - 1);
+ dec1 *end2 = stop2 + (frac2 - 1);
+ while (unlikely((buf1 <= end1) && (*end1 == 0))) end1--;
+ while (unlikely((buf2 <= end2) && (*end2 == 0))) end2--;
+ frac1 = (int)(end1 - stop1) + 1;
+ frac2 = (int)(end2 - stop2) + 1;
+ while (buf1 <= end1 && buf2 <= end2 && *buf1 == *buf2) buf1++, buf2++;
+ if (buf1 <= end1) {
+ if (buf2 <= end2)
+ carry = *buf2 > *buf1;
+ else
+ carry = 0;
+ } else {
+ if (buf2 <= end2)
+ carry = 1;
+ else /* short-circuit everything: from1 == from2 */
+ {
+ if (to == 0) /* decimal_cmp() */
+ return 0;
+ decimal_make_zero(to);
+ return E_DEC_OK;
+ }
+ }
+ }
+
+ if (to == 0) /* decimal_cmp() */
+ return carry == from1->sign ? 1 : -1;
+
+ sanity(to);
+
+ to->sign = from1->sign;
+
+ /* ensure that always from1 > from2 (and intg1 >= intg2) */
+ if (carry) {
+ std::swap(from1, from2);
+ std::swap(start1, start2);
+ std::swap(intg1, intg2);
+ std::swap(frac1, frac2);
+ to->sign = 1 - to->sign;
+ }
+
+ FIX_INTG_FRAC_ERROR(to->len, intg1, frac0, error);
+ buf0 = to->buf + intg1 + frac0;
+
+ to->frac = MY_MAX(from1->frac, from2->frac);
+ to->intg = intg1 * DIG_PER_DEC1;
+ if (unlikely(error)) {
+ set_if_smaller(to->frac, frac0 * DIG_PER_DEC1);
+ set_if_smaller(frac1, frac0);
+ set_if_smaller(frac2, frac0);
+ set_if_smaller(intg2, intg1);
+ }
+ carry = 0;
+
+ /* part 1 - max(frac) ... min (frac) */
+ if (frac1 > frac2) {
+ buf1 = start1 + intg1 + frac1;
+ stop1 = start1 + intg1 + frac2;
+ buf2 = start2 + intg2 + frac2;
+ while (frac0-- > frac1) *--buf0 = 0;
+ while (buf1 > stop1) *--buf0 = *--buf1;
+ } else {
+ buf1 = start1 + intg1 + frac1;
+ buf2 = start2 + intg2 + frac2;
+ stop2 = start2 + intg2 + frac1;
+ while (frac0-- > frac2) *--buf0 = 0;
+ while (buf2 > stop2) {
+ SUB(*--buf0, 0, *--buf2, carry);
+ }
+ }
+
+ /* part 2 - min(frac) ... intg2 */
+ while (buf2 > start2) {
+ SUB(*--buf0, *--buf1, *--buf2, carry);
+ }
+
+ /* part 3 - intg2 ... intg1 */
+ while (carry && buf1 > start1) {
+ SUB(*--buf0, *--buf1, 0, carry);
+ }
+
+ while (buf1 > start1) *--buf0 = *--buf1;
+
+ while (buf0 > to->buf) *--buf0 = 0;
+
+ return error;
+}
+
+int decimal_intg(const decimal_t *from) {
+ int res;
+ remove_leading_zeroes(from, &res);
+ return res;
+}
+
+int decimal_add(const decimal_t *from1, const decimal_t *from2, decimal_t *to) {
+ if (likely(from1->sign == from2->sign)) return do_add(from1, from2, to);
+ return do_sub(from1, from2, to);
+}
+
+int decimal_sub(const decimal_t *from1, const decimal_t *from2, decimal_t *to) {
+ if (likely(from1->sign == from2->sign)) return do_sub(from1, from2, to);
+ return do_add(from1, from2, to);
+}
+
+int decimal_cmp(const decimal_t *from1, const decimal_t *from2) {
+ if (likely(from1->sign == from2->sign)) return do_sub(from1, from2, 0);
+
+ // Reject negative zero, cfr. string2decimal()
+ DBUG_ASSERT(!(decimal_is_zero(from1) && from1->sign));
+ DBUG_ASSERT(!(decimal_is_zero(from2) && from2->sign));
+
+ return from1->sign > from2->sign ? -1 : 1;
+}
+
+int decimal_is_zero(const decimal_t *from) {
+ dec1 *buf1 = from->buf,
+ *end = buf1 + ROUND_UP(from->intg) + ROUND_UP(from->frac);
+ while (buf1 < end)
+ if (*buf1++) return 0;
+ return 1;
+}
+
+/*
+ multiply two decimals
+
+ SYNOPSIS
+ decimal_mul()
+ from_1, from_2 - factors
+ to - product
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW;
+
+ NOTES
+ in this implementation, with sizeof(dec1)=4 we have DIG_PER_DEC1=9,
+ and 63-digit number will take only 7 dec1 words (basically a 7-digit
+ "base 999999999" number). Thus there's no need in fast multiplication
+ algorithms, 7-digit numbers can be multiplied with a naive O(n*n)
+ method.
+
+ XXX if this library is to be used with huge numbers of thousands of
+ digits, fast multiplication must be implemented.
+*/
+int decimal_mul(const decimal_t *from_1, const decimal_t *from_2,
+ decimal_t *to) {
+ if (decimal_is_zero(from_1) || decimal_is_zero(from_2)) {
+ decimal_make_zero(to);
+ return E_DEC_OK;
+ }
+ decimal_t f1 = *from_1;
+ decimal_t f2 = *from_2;
+ f1.buf = remove_leading_zeroes(&f1, &f1.intg);
+ f2.buf = remove_leading_zeroes(&f2, &f2.intg);
+
+ const decimal_t *from1 = &f1;
+ const decimal_t *from2 = &f2;
+ int intg1 = ROUND_UP(from1->intg), intg2 = ROUND_UP(from2->intg),
+ frac1 = ROUND_UP(from1->frac), frac2 = ROUND_UP(from2->frac),
+ intg0 = ROUND_UP(from1->intg + from2->intg), frac0 = frac1 + frac2, error,
+ iii, jjj, d_to_move;
+ dec1 *buf1 = from1->buf + intg1, *buf2 = from2->buf + intg2, *buf0, *start2,
+ *stop2, *stop1, *start0, carry;
+
+ sanity(to);
+
+ iii = intg0; /* save 'ideal' values */
+ jjj = frac0;
+ FIX_INTG_FRAC_ERROR(to->len, intg0, frac0, error); /* bound size */
+ to->sign = from1->sign != from2->sign;
+ to->frac = from1->frac + from2->frac; /* store size in digits */
+ set_if_smaller(to->frac, NOT_FIXED_DEC);
+ to->intg = intg0 * DIG_PER_DEC1;
+
+ if (unlikely(error)) {
+ set_if_smaller(to->frac, frac0 * DIG_PER_DEC1);
+ set_if_smaller(to->intg, intg0 * DIG_PER_DEC1);
+ if (unlikely(iii > intg0)) /* bounded integer-part */
+ {
+ iii -= intg0;
+ jjj = iii >> 1;
+ intg1 -= jjj;
+ intg2 -= iii - jjj;
+ frac1 = frac2 = 0; /* frac0 is already 0 here */
+ } else /* bounded fract part */
+ {
+ jjj -= frac0;
+ iii = jjj >> 1;
+ if (frac1 <= frac2) {
+ frac1 -= iii;
+ frac2 -= jjj - iii;
+ } else {
+ frac2 -= iii;
+ frac1 -= jjj - iii;
+ }
+ }
+ }
+ start0 = to->buf + intg0 + frac0 - 1;
+ start2 = buf2 + frac2 - 1;
+ stop1 = buf1 - intg1;
+ stop2 = buf2 - intg2;
+
+ memset(to->buf, 0, (intg0 + frac0) * sizeof(dec1));
+
+ for (buf1 += frac1 - 1; buf1 >= stop1; buf1--, start0--) {
+ carry = 0;
+ for (buf0 = start0, buf2 = start2; buf2 >= stop2; buf2--, buf0--) {
+ dec1 hi, lo;
+ dec2 p = ((dec2)*buf1) * ((dec2)*buf2);
+ hi = (dec1)(p / DIG_BASE);
+ lo = (dec1)(p - ((dec2)hi) * DIG_BASE);
+ ADD2(*buf0, *buf0, lo, carry);
+ carry += hi;
+ }
+ if (carry) {
+ if (buf0 < to->buf) return E_DEC_OVERFLOW;
+ ADD2(*buf0, *buf0, 0, carry);
+ }
+ for (buf0--; carry; buf0--) {
+ if (buf0 < to->buf) return E_DEC_OVERFLOW;
+ ADD(*buf0, *buf0, 0, carry);
+ }
+ }
+
+ /* Now we have to check for -0.000 case */
+ if (to->sign) {
+ dec1 *buf = to->buf;
+ dec1 *end = to->buf + intg0 + frac0;
+ DBUG_ASSERT(buf != end);
+ for (;;) {
+ if (*buf) break;
+ if (++buf == end) {
+ /* We got decimal zero */
+ decimal_make_zero(to);
+ break;
+ }
+ }
+ }
+ buf1 = to->buf;
+ d_to_move = intg0 + ROUND_UP(to->frac);
+ while (!*buf1 && (to->intg > DIG_PER_DEC1)) {
+ buf1++;
+ to->intg -= DIG_PER_DEC1;
+ d_to_move--;
+ }
+ if (to->buf < buf1) {
+ dec1 *cur_d = to->buf;
+ for (; d_to_move--; cur_d++, buf1++) *cur_d = *buf1;
+ }
+ return error;
+}
+
+/*
+ naive division algorithm (Knuth's Algorithm D in 4.3.1) -
+ it's ok for short numbers
+ also we're using alloca() to allocate a temporary buffer
+
+ XXX if this library is to be used with huge numbers of thousands of
+ digits, fast division must be implemented and alloca should be
+ changed to malloc (or at least fallback to malloc if alloca() fails)
+ but then, decimal_mul() should be rewritten too :(
+*/
+static int do_div_mod(const decimal_t *from1, const decimal_t *from2,
+ decimal_t *to, decimal_t *mod, int scale_incr) {
+ /*
+ frac* - number of digits in fractional part of the number
+ prec* - precision of the number
+ intg* - number of digits in the integer part
+ buf* - buffer having the actual number
+ All variables ending with 0 - like frac0, intg0 etc are
+ for the final result. Similarly frac1, intg1 etc are for
+ the first number and frac2, intg2 etc are for the second number
+ */
+ int frac1 = ROUND_UP(from1->frac) * DIG_PER_DEC1, prec1 = from1->intg + frac1,
+ frac2 = ROUND_UP(from2->frac) * DIG_PER_DEC1, prec2 = from2->intg + frac2,
+ error = 0, i, intg0, frac0, len1, len2,
+ dintg, /* Holds the estimate of number of integer digits in final result
+ */
+ div_mod = (!mod) /*true if this is division */;
+ dec1 *buf0, *buf1 = from1->buf, *buf2 = from2->buf, *start1, *stop1, *start2,
+ *stop2, *stop0, norm2, carry, dcarry, *tmp1;
+ dec2 norm_factor, x, guess, y;
+
+ if (mod) to = mod;
+
+ sanity(to);
+
+ /*
+ removing all the leading zeroes in the second number. Leading zeroes are
+ added later to the result.
+ */
+ i = ((prec2 - 1) % DIG_PER_DEC1) + 1;
+ while (prec2 > 0 && *buf2 == 0) {
+ prec2 -= i;
+ i = DIG_PER_DEC1;
+ buf2++;
+ }
+ if (prec2 <= 0) /* short-circuit everything: from2 == 0 */
+ return E_DEC_DIV_ZERO;
+
+ /*
+ Remove the remanining zeroes . For ex: for 0.000000000001
+ the above while loop removes 9 zeroes and the result will have 0.0001
+ these remaining zeroes are removed here
+ */
+ prec2 -= count_leading_zeroes((prec2 - 1) % DIG_PER_DEC1, *buf2);
+ DBUG_ASSERT(prec2 > 0);
+
+ /*
+ Do the same for the first number. Remove the leading zeroes.
+ Check if the number is actually 0. Then remove the remaining zeroes.
+ */
+
+ i = ((prec1 - 1) % DIG_PER_DEC1) + 1;
+ while (prec1 > 0 && *buf1 == 0) {
+ prec1 -= i;
+ i = DIG_PER_DEC1;
+ buf1++;
+ }
+ if (prec1 <= 0) { /* short-circuit everything: from1 == 0 */
+ decimal_make_zero(to);
+ return E_DEC_OK;
+ }
+ prec1 -= count_leading_zeroes((prec1 - 1) % DIG_PER_DEC1, *buf1);
+ DBUG_ASSERT(prec1 > 0);
+
+ /* let's fix scale_incr, taking into account frac1,frac2 increase */
+ if ((scale_incr -= frac1 - from1->frac + frac2 - from2->frac) < 0)
+ scale_incr = 0;
+
+ /* Calculate the integer digits in final result */
+ dintg = (prec1 - frac1) - (prec2 - frac2) + (*buf1 >= *buf2);
+ if (dintg < 0) {
+ dintg /= DIG_PER_DEC1;
+ intg0 = 0;
+ } else
+ intg0 = ROUND_UP(dintg);
+ if (mod) {
+ /* we're calculating N1 % N2.
+ The result will have
+ frac=max(frac1, frac2), as for subtraction
+ intg=intg2
+ */
+ to->sign = from1->sign;
+ to->frac = MY_MAX(from1->frac, from2->frac);
+ frac0 = 0;
+ } else {
+ /*
+ we're calculating N1/N2. N1 is in the buf1, has prec1 digits
+ N2 is in the buf2, has prec2 digits. Scales are frac1 and
+ frac2 accordingly.
+ Thus, the result will have
+ frac = ROUND_UP(frac1+frac2+scale_incr)
+ and
+ intg = (prec1-frac1) - (prec2-frac2) + 1
+ prec = intg+frac
+ */
+ frac0 = ROUND_UP(frac1 + frac2 + scale_incr);
+ FIX_INTG_FRAC_ERROR(to->len, intg0, frac0, error);
+ to->sign = from1->sign != from2->sign;
+ to->intg = intg0 * DIG_PER_DEC1;
+ to->frac = frac0 * DIG_PER_DEC1;
+ }
+ buf0 = to->buf;
+ stop0 = buf0 + intg0 + frac0;
+ if (likely(div_mod))
+ while (dintg++ < 0 && buf0 < &to->buf[to->len]) {
+ *buf0++ = 0;
+ }
+
+ len1 = (i = ROUND_UP(prec1)) + ROUND_UP(2 * frac2 + scale_incr + 1) + 1;
+ set_if_bigger(len1, 3);
+ if (!(tmp1 = (dec1 *)my_alloca(len1 * sizeof(dec1)))) return E_DEC_OOM;
+ memcpy(tmp1, buf1, i * sizeof(dec1));
+ memset(tmp1 + i, 0, (len1 - i) * sizeof(dec1));
+
+ start1 = tmp1;
+ stop1 = start1 + len1;
+ start2 = buf2;
+ stop2 = buf2 + ROUND_UP(prec2) - 1;
+
+ /* removing end zeroes */
+ while (*stop2 == 0 && stop2 >= start2) stop2--;
+ len2 = (int)(stop2++ - start2);
+
+ /*
+ calculating norm2 (normalized *start2) - we need *start2 to be large
+ (at least > DIG_BASE/2), but unlike Knuth's Alg. D we don't want to
+ normalize input numbers (as we don't make a copy of the divisor).
+ Thus we normalize first dec1 of buf2 only, and we'll normalize *start1
+ on the fly for the purpose of guesstimation only.
+ It's also faster, as we're saving on normalization of buf2
+ */
+ norm_factor = DIG_BASE / (*start2 + 1);
+ norm2 = (dec1)(norm_factor * start2[0]);
+ if (likely(len2 > 0)) norm2 += (dec1)(norm_factor * start2[1] / DIG_BASE);
+
+ if (*start1 < *start2)
+ dcarry = *start1++;
+ else
+ dcarry = 0;
+
+ /* main loop */
+ for (; buf0 < stop0; buf0++) {
+ /* short-circuit, if possible */
+ if (unlikely(dcarry == 0 && *start1 < *start2))
+ guess = 0;
+ else {
+ /* D3: make a guess */
+ x = start1[0] + ((dec2)dcarry) * DIG_BASE;
+ y = start1[1];
+ guess = (norm_factor * x + norm_factor * y / DIG_BASE) / norm2;
+ if (unlikely(guess >= DIG_BASE)) guess = DIG_BASE - 1;
+ if (likely(len2 > 0)) {
+ /* hmm, this is a suspicious trick - I removed normalization here */
+ if (start2[1] * guess > (x - guess * start2[0]) * DIG_BASE + y) guess--;
+ if (unlikely(start2[1] * guess >
+ (x - guess * start2[0]) * DIG_BASE + y))
+ guess--;
+ DBUG_ASSERT(start2[1] * guess <=
+ (x - guess * start2[0]) * DIG_BASE + y);
+ }
+
+ /* D4: multiply and subtract */
+ buf2 = stop2;
+ buf1 = start1 + len2;
+ DBUG_ASSERT(buf1 < stop1);
+ for (carry = 0; buf2 > start2; buf1--) {
+ dec1 hi, lo;
+ x = guess * (*--buf2);
+ hi = (dec1)(x / DIG_BASE);
+ lo = (dec1)(x - ((dec2)hi) * DIG_BASE);
+ SUB2(*buf1, *buf1, lo, carry);
+ carry += hi;
+ }
+ carry = dcarry < carry;
+
+ /* D5: check the remainder */
+ if (unlikely(carry)) {
+ /* D6: correct the guess */
+ guess--;
+ buf2 = stop2;
+ buf1 = start1 + len2;
+ for (carry = 0; buf2 > start2; buf1--) {
+ ADD(*buf1, *buf1, *--buf2, carry);
+ }
+ }
+ }
+ if (likely(div_mod)) {
+ DBUG_ASSERT(buf0 < to->buf + to->len);
+ *buf0 = (dec1)guess;
+ }
+ dcarry = *start1;
+ start1++;
+ }
+ if (mod) {
+ /*
+ now the result is in tmp1, it has
+ intg=prec1-frac1 if there were no leading zeroes.
+ If leading zeroes were present, they have been removed
+ earlier. We need to now add them back to the result.
+ frac=max(frac1, frac2)=to->frac
+ */
+ if (dcarry) *--start1 = dcarry;
+ buf0 = to->buf;
+ /* Calculate the final result's integer digits */
+ dintg = (prec1 - frac1) - ((start1 - tmp1) * DIG_PER_DEC1);
+ if (dintg < 0) {
+ /* If leading zeroes in the fractional part were earlier stripped */
+ intg0 = dintg / DIG_PER_DEC1;
+ } else
+ intg0 = ROUND_UP(dintg);
+ frac0 = ROUND_UP(to->frac);
+ error = E_DEC_OK;
+ if (unlikely(frac0 == 0 && intg0 == 0)) {
+ decimal_make_zero(to);
+ goto done;
+ }
+ if (intg0 <= 0) {
+ /* Add back the leading zeroes that were earlier stripped */
+ if (unlikely(-intg0 >= to->len)) {
+ decimal_make_zero(to);
+ error = E_DEC_TRUNCATED;
+ goto done;
+ }
+ stop1 = start1 + frac0 + intg0;
+ frac0 += intg0;
+ to->intg = 0;
+ while (intg0++ < 0) *buf0++ = 0;
+ } else {
+ if (unlikely(intg0 > to->len)) {
+ frac0 = 0;
+ intg0 = to->len;
+ error = E_DEC_OVERFLOW;
+ goto done;
+ }
+ DBUG_ASSERT(intg0 <= ROUND_UP(from2->intg));
+ stop1 = start1 + frac0 + intg0;
+ to->intg = MY_MIN(intg0 * DIG_PER_DEC1, from2->intg);
+ }
+ if (unlikely(intg0 + frac0 > to->len)) {
+ stop1 -= frac0 + intg0 - to->len;
+ frac0 = to->len - intg0;
+ to->frac = frac0 * DIG_PER_DEC1;
+ error = E_DEC_TRUNCATED;
+ }
+ DBUG_ASSERT(buf0 + (stop1 - start1) <= to->buf + to->len);
+ while (start1 < stop1) *buf0++ = *start1++;
+ }
+done:
+ if (decimal_is_zero(to)) {
+ // Return "0." rather than "0.000000"
+ decimal_make_zero(to);
+ } else {
+ tmp1 = remove_leading_zeroes(to, &to->intg);
+ if (to->buf != tmp1)
+ memmove(to->buf, tmp1,
+ (ROUND_UP(to->intg) + ROUND_UP(to->frac)) * sizeof(dec1));
+ }
+ DBUG_ASSERT(to->intg + to->frac > 0);
+ return error;
+}
+
+/*
+ division of two decimals
+
+ SYNOPSIS
+ decimal_div()
+ from1 - dividend
+ from2 - divisor
+ to - quotient
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW/E_DEC_DIV_ZERO;
+
+ NOTES
+ see do_div_mod()
+*/
+
+int decimal_div(const decimal_t *from1, const decimal_t *from2, decimal_t *to,
+ int scale_incr) {
+ return do_div_mod(from1, from2, to, 0, scale_incr);
+}
+
+/*
+ modulus
+
+ SYNOPSIS
+ decimal_mod()
+ from1 - dividend
+ from2 - divisor
+ to - modulus
+
+ RETURN VALUE
+ E_DEC_OK/E_DEC_TRUNCATED/E_DEC_OVERFLOW/E_DEC_DIV_ZERO;
+
+ NOTES
+ see do_div_mod()
+
+ DESCRIPTION
+ the modulus R in R = M mod N
+
+ is defined as
+
+ 0 <= |R| < |M|
+ sign R == sign M
+ R = M - k*N, where k is integer
+
+ thus, there's no requirement for M or N to be integers
+*/
+
+int decimal_mod(const decimal_t *from1, const decimal_t *from2, decimal_t *to) {
+ return do_div_mod(from1, from2, 0, to, 0);
+}
diff --git a/libmysqlclient/mysql/strings/decimal.cc.orig b/libmysqlclient/mysql/strings/decimal.cc.orig
new file mode 120000
index 0000000..a315c4f
--- /dev/null
+++ b/libmysqlclient/mysql/strings/decimal.cc.orig
@@ -0,0 +1 @@
+../../../upstream/strings/decimal.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/do_ctype.cc b/libmysqlclient/mysql/strings/do_ctype.cc
new file mode 120000
index 0000000..05a5894
--- /dev/null
+++ b/libmysqlclient/mysql/strings/do_ctype.cc
@@ -0,0 +1 @@
+../../../upstream/strings/do_ctype.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/dtoa.cc b/libmysqlclient/mysql/strings/dtoa.cc
new file mode 120000
index 0000000..9dd6202
--- /dev/null
+++ b/libmysqlclient/mysql/strings/dtoa.cc
@@ -0,0 +1 @@
+../../../upstream/strings/dtoa.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/dump_map.cc b/libmysqlclient/mysql/strings/dump_map.cc
new file mode 120000
index 0000000..ee16fe3
--- /dev/null
+++ b/libmysqlclient/mysql/strings/dump_map.cc
@@ -0,0 +1 @@
+../../../upstream/strings/dump_map.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/int2str.cc b/libmysqlclient/mysql/strings/int2str.cc
new file mode 120000
index 0000000..817365c
--- /dev/null
+++ b/libmysqlclient/mysql/strings/int2str.cc
@@ -0,0 +1 @@
+../../../upstream/strings/int2str.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/longlong2str.cc b/libmysqlclient/mysql/strings/longlong2str.cc
new file mode 120000
index 0000000..ac8e05e
--- /dev/null
+++ b/libmysqlclient/mysql/strings/longlong2str.cc
@@ -0,0 +1 @@
+../../../upstream/strings/longlong2str.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/mb_wc.h b/libmysqlclient/mysql/strings/mb_wc.h
new file mode 120000
index 0000000..447bf27
--- /dev/null
+++ b/libmysqlclient/mysql/strings/mb_wc.h
@@ -0,0 +1 @@
+../../../upstream/strings/mb_wc.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/my_strchr.cc b/libmysqlclient/mysql/strings/my_strchr.cc
new file mode 120000
index 0000000..54a37cb
--- /dev/null
+++ b/libmysqlclient/mysql/strings/my_strchr.cc
@@ -0,0 +1 @@
+../../../upstream/strings/my_strchr.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/my_strtoll10.cc b/libmysqlclient/mysql/strings/my_strtoll10.cc
new file mode 120000
index 0000000..435e12c
--- /dev/null
+++ b/libmysqlclient/mysql/strings/my_strtoll10.cc
@@ -0,0 +1 @@
+../../../upstream/strings/my_strtoll10.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/str2int.cc b/libmysqlclient/mysql/strings/str2int.cc
new file mode 120000
index 0000000..8444367
--- /dev/null
+++ b/libmysqlclient/mysql/strings/str2int.cc
@@ -0,0 +1 @@
+../../../upstream/strings/str2int.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/str_alloc.cc b/libmysqlclient/mysql/strings/str_alloc.cc
new file mode 120000
index 0000000..142c893
--- /dev/null
+++ b/libmysqlclient/mysql/strings/str_alloc.cc
@@ -0,0 +1 @@
+../../../upstream/strings/str_alloc.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/str_uca_type.h b/libmysqlclient/mysql/strings/str_uca_type.h
new file mode 120000
index 0000000..d3e0095
--- /dev/null
+++ b/libmysqlclient/mysql/strings/str_uca_type.h
@@ -0,0 +1 @@
+../../../upstream/strings/str_uca_type.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/strcont.cc b/libmysqlclient/mysql/strings/strcont.cc
new file mode 120000
index 0000000..c6bef3c
--- /dev/null
+++ b/libmysqlclient/mysql/strings/strcont.cc
@@ -0,0 +1 @@
+../../../upstream/strings/strcont.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/strmake.cc b/libmysqlclient/mysql/strings/strmake.cc
new file mode 120000
index 0000000..3989f56
--- /dev/null
+++ b/libmysqlclient/mysql/strings/strmake.cc
@@ -0,0 +1 @@
+../../../upstream/strings/strmake.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/strxmov.cc b/libmysqlclient/mysql/strings/strxmov.cc
new file mode 120000
index 0000000..9bdae84
--- /dev/null
+++ b/libmysqlclient/mysql/strings/strxmov.cc
@@ -0,0 +1 @@
+../../../upstream/strings/strxmov.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/strxnmov.cc b/libmysqlclient/mysql/strings/strxnmov.cc
new file mode 120000
index 0000000..b709006
--- /dev/null
+++ b/libmysqlclient/mysql/strings/strxnmov.cc
@@ -0,0 +1 @@
+../../../upstream/strings/strxnmov.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/t_ctype.h b/libmysqlclient/mysql/strings/t_ctype.h
new file mode 120000
index 0000000..4365e75
--- /dev/null
+++ b/libmysqlclient/mysql/strings/t_ctype.h
@@ -0,0 +1 @@
+../../../upstream/strings/t_ctype.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uca-dump.cc b/libmysqlclient/mysql/strings/uca-dump.cc
new file mode 120000
index 0000000..1cf0c98
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uca-dump.cc
@@ -0,0 +1 @@
+../../../upstream/strings/uca-dump.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uca9-dump.cc b/libmysqlclient/mysql/strings/uca9-dump.cc
new file mode 120000
index 0000000..29a6944
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uca9-dump.cc
@@ -0,0 +1 @@
+../../../upstream/strings/uca9-dump.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uca900_data.h b/libmysqlclient/mysql/strings/uca900_data.h
new file mode 120000
index 0000000..aa69600
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uca900_data.h
@@ -0,0 +1 @@
+../../../upstream/strings/uca900_data.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uca900_ja_data.h b/libmysqlclient/mysql/strings/uca900_ja_data.h
new file mode 120000
index 0000000..6a88409
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uca900_ja_data.h
@@ -0,0 +1 @@
+../../../upstream/strings/uca900_ja_data.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uca_data.h b/libmysqlclient/mysql/strings/uca_data.h
new file mode 120000
index 0000000..3281baf
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uca_data.h
@@ -0,0 +1 @@
+../../../upstream/strings/uca_data.h \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/uctypedump.cc b/libmysqlclient/mysql/strings/uctypedump.cc
new file mode 120000
index 0000000..72391ea
--- /dev/null
+++ b/libmysqlclient/mysql/strings/uctypedump.cc
@@ -0,0 +1 @@
+../../../upstream/strings/uctypedump.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/utr11-dump.cc b/libmysqlclient/mysql/strings/utr11-dump.cc
new file mode 120000
index 0000000..5e422b8
--- /dev/null
+++ b/libmysqlclient/mysql/strings/utr11-dump.cc
@@ -0,0 +1 @@
+../../../upstream/strings/utr11-dump.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/strings/xml.cc b/libmysqlclient/mysql/strings/xml.cc
new file mode 120000
index 0000000..2f0a38e
--- /dev/null
+++ b/libmysqlclient/mysql/strings/xml.cc
@@ -0,0 +1 @@
+../../../upstream/strings/xml.cc \ No newline at end of file
diff --git a/libmysqlclient/mysql/version.h.in b/libmysqlclient/mysql/version.h.in
new file mode 120000
index 0000000..246c217
--- /dev/null
+++ b/libmysqlclient/mysql/version.h.in
@@ -0,0 +1 @@
+../../upstream/include/mysql_version.h.in \ No newline at end of file
generated by cgit v1.1 at 2024-05-18 21:34:06 +0000