revision-id: 0445203d134526d7129ffdb05719933fd01edc71 (mariadb-25.3.19-8-g0445203d) parent(s): 6bd3eb12e1f6bf9001cf7975f87d58d996580b53 1d7a57b01490b43f3a32dd4b423883e8821727b5 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-13 17:34:00 +0300 message: Merge remote-tracking branch 'galera-bugs/4.x' into mariadb-4.x .gitignore | 5 +- .gitmodules | 4 + SConstruct | 52 +- asio/asio.hpp | 2 +- asio/asio/async_result.hpp | 2 +- asio/asio/basic_datagram_socket.hpp | 2 +- asio/asio/basic_deadline_timer.hpp | 2 +- asio/asio/basic_io_object.hpp | 9 +- asio/asio/basic_raw_socket.hpp | 2 +- asio/asio/basic_seq_packet_socket.hpp | 2 +- asio/asio/basic_serial_port.hpp | 4 +- asio/asio/basic_signal_set.hpp | 2 +- asio/asio/basic_socket.hpp | 2 +- asio/asio/basic_socket_acceptor.hpp | 2 +- asio/asio/basic_socket_iostream.hpp | 2 +- asio/asio/basic_socket_streambuf.hpp | 2 +- asio/asio/basic_stream_socket.hpp | 2 +- asio/asio/basic_streambuf.hpp | 2 +- asio/asio/basic_streambuf_fwd.hpp | 2 +- asio/asio/basic_waitable_timer.hpp | 2 +- asio/asio/buffer.hpp | 2 +- asio/asio/buffered_read_stream.hpp | 2 +- asio/asio/buffered_read_stream_fwd.hpp | 2 +- asio/asio/buffered_stream.hpp | 2 +- asio/asio/buffered_stream_fwd.hpp | 2 +- asio/asio/buffered_write_stream.hpp | 2 +- asio/asio/buffered_write_stream_fwd.hpp | 2 +- asio/asio/buffers_iterator.hpp | 2 +- asio/asio/completion_condition.hpp | 2 +- asio/asio/connect.hpp | 2 +- asio/asio/coroutine.hpp | 2 +- asio/asio/datagram_socket_service.hpp | 2 +- asio/asio/deadline_timer.hpp | 2 +- asio/asio/deadline_timer_service.hpp | 2 +- asio/asio/detail/addressof.hpp | 2 +- asio/asio/detail/array.hpp | 2 +- asio/asio/detail/array_fwd.hpp | 2 +- asio/asio/detail/assert.hpp | 2 +- asio/asio/detail/atomic_count.hpp | 2 +- asio/asio/detail/base_from_completion_cond.hpp | 2 +- asio/asio/detail/bind_handler.hpp | 2 +- asio/asio/detail/buffer_resize_guard.hpp | 2 +- asio/asio/detail/buffer_sequence_adapter.hpp | 2 +- asio/asio/detail/buffered_stream_storage.hpp | 2 +- asio/asio/detail/call_stack.hpp | 2 +- asio/asio/detail/chrono_time_traits.hpp | 2 +- asio/asio/detail/completion_handler.hpp | 2 +- asio/asio/detail/config.hpp | 67 +- asio/asio/detail/consuming_buffers.hpp | 2 +- asio/asio/detail/cstdint.hpp | 2 +- asio/asio/detail/date_time_fwd.hpp | 2 +- asio/asio/detail/deadline_timer_service.hpp | 2 +- asio/asio/detail/dependent_type.hpp | 2 +- asio/asio/detail/descriptor_ops.hpp | 2 +- asio/asio/detail/descriptor_read_op.hpp | 2 +- asio/asio/detail/descriptor_write_op.hpp | 2 +- asio/asio/detail/dev_poll_reactor.hpp | 2 +- asio/asio/detail/epoll_reactor.hpp | 2 +- asio/asio/detail/event.hpp | 2 +- asio/asio/detail/eventfd_select_interrupter.hpp | 2 +- asio/asio/detail/fd_set_adapter.hpp | 2 +- asio/asio/detail/fenced_block.hpp | 2 +- asio/asio/detail/function.hpp | 2 +- asio/asio/detail/gcc_arm_fenced_block.hpp | 2 +- asio/asio/detail/gcc_hppa_fenced_block.hpp | 2 +- asio/asio/detail/gcc_sync_fenced_block.hpp | 2 +- asio/asio/detail/gcc_x86_fenced_block.hpp | 2 +- asio/asio/detail/handler_alloc_helpers.hpp | 2 +- asio/asio/detail/handler_cont_helpers.hpp | 2 +- asio/asio/detail/handler_invoke_helpers.hpp | 2 +- asio/asio/detail/handler_tracking.hpp | 2 +- asio/asio/detail/handler_type_requirements.hpp | 16 +- asio/asio/detail/hash_map.hpp | 2 +- asio/asio/detail/impl/buffer_sequence_adapter.ipp | 2 +- asio/asio/detail/impl/descriptor_ops.ipp | 2 +- asio/asio/detail/impl/dev_poll_reactor.hpp | 2 +- asio/asio/detail/impl/dev_poll_reactor.ipp | 2 +- asio/asio/detail/impl/epoll_reactor.hpp | 2 +- asio/asio/detail/impl/epoll_reactor.ipp | 2 +- .../detail/impl/eventfd_select_interrupter.ipp | 2 +- asio/asio/detail/impl/handler_tracking.ipp | 2 +- asio/asio/detail/impl/kqueue_reactor.hpp | 2 +- asio/asio/detail/impl/kqueue_reactor.ipp | 2 +- asio/asio/detail/impl/pipe_select_interrupter.ipp | 2 +- asio/asio/detail/impl/posix_event.ipp | 2 +- asio/asio/detail/impl/posix_mutex.ipp | 2 +- asio/asio/detail/impl/posix_thread.ipp | 2 +- asio/asio/detail/impl/posix_tss_ptr.ipp | 2 +- .../detail/impl/reactive_descriptor_service.ipp | 2 +- .../detail/impl/reactive_serial_port_service.ipp | 2 +- .../detail/impl/reactive_socket_service_base.ipp | 2 +- asio/asio/detail/impl/resolver_service_base.ipp | 2 +- asio/asio/detail/impl/select_reactor.hpp | 2 +- asio/asio/detail/impl/select_reactor.ipp | 2 +- asio/asio/detail/impl/service_registry.hpp | 2 +- asio/asio/detail/impl/service_registry.ipp | 2 +- asio/asio/detail/impl/signal_set_service.ipp | 2 +- asio/asio/detail/impl/socket_ops.ipp | 14 +- .../asio/detail/impl/socket_select_interrupter.ipp | 5 +- asio/asio/detail/impl/strand_service.hpp | 2 +- asio/asio/detail/impl/strand_service.ipp | 2 +- asio/asio/detail/impl/task_io_service.hpp | 2 +- asio/asio/detail/impl/task_io_service.ipp | 2 +- asio/asio/detail/impl/throw_error.ipp | 2 +- asio/asio/detail/impl/timer_queue_ptime.ipp | 2 +- asio/asio/detail/impl/timer_queue_set.ipp | 2 +- asio/asio/detail/impl/win_event.ipp | 14 +- asio/asio/detail/impl/win_iocp_handle_service.ipp | 4 +- asio/asio/detail/impl/win_iocp_io_service.hpp | 2 +- asio/asio/detail/impl/win_iocp_io_service.ipp | 2 +- .../detail/impl/win_iocp_serial_port_service.ipp | 2 +- .../detail/impl/win_iocp_socket_service_base.ipp | 2 +- asio/asio/detail/impl/win_mutex.ipp | 7 +- .../asio/detail/impl/win_object_handle_service.ipp | 2 +- asio/asio/detail/impl/win_static_mutex.ipp | 20 +- asio/asio/detail/impl/win_thread.ipp | 14 +- asio/asio/detail/impl/win_tss_ptr.ipp | 2 +- .../detail/impl/winrt_ssocket_service_base.ipp | 2 +- asio/asio/detail/impl/winrt_timer_scheduler.hpp | 2 +- asio/asio/detail/impl/winrt_timer_scheduler.ipp | 2 +- asio/asio/detail/impl/winsock_init.ipp | 2 +- asio/asio/detail/io_control.hpp | 2 +- asio/asio/detail/keyword_tss_ptr.hpp | 2 +- asio/asio/detail/kqueue_reactor.hpp | 2 +- asio/asio/detail/local_free_on_block_exit.hpp | 4 +- asio/asio/detail/macos_fenced_block.hpp | 2 +- asio/asio/detail/mutex.hpp | 2 +- asio/asio/detail/noncopyable.hpp | 2 +- asio/asio/detail/null_event.hpp | 2 +- asio/asio/detail/null_fenced_block.hpp | 2 +- asio/asio/detail/null_mutex.hpp | 2 +- asio/asio/detail/null_reactor.hpp | 2 +- asio/asio/detail/null_signal_blocker.hpp | 2 +- asio/asio/detail/null_socket_service.hpp | 2 +- asio/asio/detail/null_static_mutex.hpp | 2 +- asio/asio/detail/null_thread.hpp | 2 +- asio/asio/detail/null_tss_ptr.hpp | 2 +- asio/asio/detail/object_pool.hpp | 2 +- asio/asio/detail/old_win_sdk_compat.hpp | 2 +- asio/asio/detail/op_queue.hpp | 2 +- asio/asio/detail/operation.hpp | 2 +- asio/asio/detail/pipe_select_interrupter.hpp | 2 +- asio/asio/detail/pop_options.hpp | 2 +- asio/asio/detail/posix_event.hpp | 2 +- asio/asio/detail/posix_fd_set_adapter.hpp | 2 +- asio/asio/detail/posix_mutex.hpp | 2 +- asio/asio/detail/posix_signal_blocker.hpp | 2 +- asio/asio/detail/posix_static_mutex.hpp | 2 +- asio/asio/detail/posix_thread.hpp | 2 +- asio/asio/detail/posix_tss_ptr.hpp | 2 +- asio/asio/detail/push_options.hpp | 2 +- asio/asio/detail/reactive_descriptor_service.hpp | 2 +- asio/asio/detail/reactive_null_buffers_op.hpp | 2 +- asio/asio/detail/reactive_serial_port_service.hpp | 2 +- asio/asio/detail/reactive_socket_accept_op.hpp | 2 +- asio/asio/detail/reactive_socket_connect_op.hpp | 2 +- asio/asio/detail/reactive_socket_recv_op.hpp | 2 +- asio/asio/detail/reactive_socket_recvfrom_op.hpp | 2 +- asio/asio/detail/reactive_socket_recvmsg_op.hpp | 2 +- asio/asio/detail/reactive_socket_send_op.hpp | 2 +- asio/asio/detail/reactive_socket_sendto_op.hpp | 2 +- asio/asio/detail/reactive_socket_service.hpp | 2 +- asio/asio/detail/reactive_socket_service_base.hpp | 2 +- asio/asio/detail/reactor.hpp | 2 +- asio/asio/detail/reactor_fwd.hpp | 2 +- asio/asio/detail/reactor_op.hpp | 2 +- asio/asio/detail/reactor_op_queue.hpp | 2 +- asio/asio/detail/regex_fwd.hpp | 2 +- asio/asio/detail/resolve_endpoint_op.hpp | 2 +- asio/asio/detail/resolve_op.hpp | 2 +- asio/asio/detail/resolver_service.hpp | 2 +- asio/asio/detail/resolver_service_base.hpp | 2 +- asio/asio/detail/scoped_lock.hpp | 2 +- asio/asio/detail/scoped_ptr.hpp | 2 +- asio/asio/detail/select_interrupter.hpp | 2 +- asio/asio/detail/select_reactor.hpp | 2 +- asio/asio/detail/service_registry.hpp | 2 +- asio/asio/detail/shared_ptr.hpp | 2 +- asio/asio/detail/signal_blocker.hpp | 2 +- asio/asio/detail/signal_handler.hpp | 2 +- asio/asio/detail/signal_init.hpp | 2 +- asio/asio/detail/signal_op.hpp | 2 +- asio/asio/detail/signal_set_service.hpp | 2 +- asio/asio/detail/socket_holder.hpp | 2 +- asio/asio/detail/socket_ops.hpp | 2 +- asio/asio/detail/socket_option.hpp | 2 +- asio/asio/detail/socket_select_interrupter.hpp | 2 +- asio/asio/detail/socket_types.hpp | 10 +- asio/asio/detail/solaris_fenced_block.hpp | 2 +- asio/asio/detail/static_mutex.hpp | 2 +- asio/asio/detail/std_event.hpp | 2 +- asio/asio/detail/std_mutex.hpp | 2 +- asio/asio/detail/std_static_mutex.hpp | 2 +- asio/asio/detail/std_thread.hpp | 2 +- asio/asio/detail/strand_service.hpp | 2 +- asio/asio/detail/task_io_service.hpp | 2 +- asio/asio/detail/task_io_service_operation.hpp | 2 +- asio/asio/detail/task_io_service_thread_info.hpp | 2 +- asio/asio/detail/thread.hpp | 10 +- asio/asio/detail/thread_info_base.hpp | 2 +- asio/asio/detail/throw_error.hpp | 2 +- asio/asio/detail/throw_exception.hpp | 2 +- asio/asio/detail/timer_queue.hpp | 2 +- asio/asio/detail/timer_queue_base.hpp | 2 +- asio/asio/detail/timer_queue_ptime.hpp | 2 +- asio/asio/detail/timer_queue_set.hpp | 2 +- asio/asio/detail/timer_scheduler.hpp | 2 +- asio/asio/detail/timer_scheduler_fwd.hpp | 2 +- asio/asio/detail/tss_ptr.hpp | 2 +- asio/asio/detail/type_traits.hpp | 2 +- asio/asio/detail/variadic_templates.hpp | 2 +- asio/asio/detail/wait_handler.hpp | 2 +- asio/asio/detail/wait_op.hpp | 2 +- asio/asio/detail/weak_ptr.hpp | 2 +- asio/asio/detail/win_event.hpp | 6 +- asio/asio/detail/win_fd_set_adapter.hpp | 2 +- asio/asio/detail/win_fenced_block.hpp | 2 +- asio/asio/detail/win_iocp_handle_read_op.hpp | 2 +- asio/asio/detail/win_iocp_handle_service.hpp | 2 +- asio/asio/detail/win_iocp_handle_write_op.hpp | 2 +- asio/asio/detail/win_iocp_io_service.hpp | 2 +- asio/asio/detail/win_iocp_null_buffers_op.hpp | 2 +- asio/asio/detail/win_iocp_operation.hpp | 2 +- asio/asio/detail/win_iocp_overlapped_op.hpp | 2 +- asio/asio/detail/win_iocp_overlapped_ptr.hpp | 2 +- asio/asio/detail/win_iocp_serial_port_service.hpp | 2 +- asio/asio/detail/win_iocp_socket_accept_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_connect_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_recv_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_recvfrom_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_recvmsg_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_send_op.hpp | 2 +- asio/asio/detail/win_iocp_socket_service.hpp | 2 +- asio/asio/detail/win_iocp_socket_service_base.hpp | 2 +- asio/asio/detail/win_iocp_thread_info.hpp | 2 +- asio/asio/detail/win_mutex.hpp | 2 +- asio/asio/detail/win_object_handle_service.hpp | 2 +- asio/asio/detail/win_static_mutex.hpp | 2 +- asio/asio/detail/win_thread.hpp | 10 +- asio/asio/detail/win_tss_ptr.hpp | 2 +- asio/asio/detail/winrt_async_manager.hpp | 2 +- asio/asio/detail/winrt_async_op.hpp | 2 +- asio/asio/detail/winrt_resolve_op.hpp | 2 +- asio/asio/detail/winrt_resolver_service.hpp | 2 +- asio/asio/detail/winrt_socket_connect_op.hpp | 2 +- asio/asio/detail/winrt_socket_recv_op.hpp | 2 +- asio/asio/detail/winrt_socket_send_op.hpp | 2 +- asio/asio/detail/winrt_ssocket_service.hpp | 2 +- asio/asio/detail/winrt_ssocket_service_base.hpp | 2 +- asio/asio/detail/winrt_timer_scheduler.hpp | 2 +- asio/asio/detail/winrt_utils.hpp | 2 +- asio/asio/detail/winsock_init.hpp | 2 +- asio/asio/detail/wrapped_handler.hpp | 2 +- asio/asio/error.hpp | 2 +- asio/asio/error_code.hpp | 2 +- asio/asio/generic/basic_endpoint.hpp | 2 +- asio/asio/generic/datagram_protocol.hpp | 2 +- asio/asio/generic/detail/endpoint.hpp | 2 +- asio/asio/generic/detail/impl/endpoint.ipp | 2 +- asio/asio/generic/raw_protocol.hpp | 2 +- asio/asio/generic/seq_packet_protocol.hpp | 2 +- asio/asio/generic/stream_protocol.hpp | 2 +- asio/asio/handler_alloc_hook.hpp | 2 +- asio/asio/handler_continuation_hook.hpp | 2 +- asio/asio/handler_invoke_hook.hpp | 2 +- asio/asio/handler_type.hpp | 2 +- asio/asio/high_resolution_timer.hpp | 2 +- asio/asio/impl/buffered_read_stream.hpp | 2 +- asio/asio/impl/buffered_write_stream.hpp | 2 +- asio/asio/impl/connect.hpp | 4 +- asio/asio/impl/error.ipp | 2 +- asio/asio/impl/error_code.ipp | 54 +- asio/asio/impl/handler_alloc_hook.ipp | 2 +- asio/asio/impl/io_service.hpp | 2 +- asio/asio/impl/io_service.ipp | 2 +- asio/asio/impl/read.hpp | 2 +- asio/asio/impl/read_at.hpp | 2 +- asio/asio/impl/read_until.hpp | 2 +- asio/asio/impl/serial_port_base.hpp | 2 +- asio/asio/impl/serial_port_base.ipp | 2 +- asio/asio/impl/spawn.hpp | 2 +- asio/asio/impl/src.cpp | 2 +- asio/asio/impl/src.hpp | 2 +- asio/asio/impl/use_future.hpp | 18 +- asio/asio/impl/write.hpp | 2 +- asio/asio/impl/write_at.hpp | 2 +- asio/asio/io_service.hpp | 2 +- asio/asio/ip/address.hpp | 2 +- asio/asio/ip/address_v4.hpp | 2 +- asio/asio/ip/address_v6.hpp | 2 +- asio/asio/ip/basic_endpoint.hpp | 2 +- asio/asio/ip/basic_resolver.hpp | 2 +- asio/asio/ip/basic_resolver_entry.hpp | 2 +- asio/asio/ip/basic_resolver_iterator.hpp | 2 +- asio/asio/ip/basic_resolver_query.hpp | 2 +- asio/asio/ip/detail/endpoint.hpp | 2 +- asio/asio/ip/detail/impl/endpoint.ipp | 2 +- asio/asio/ip/detail/socket_option.hpp | 2 +- asio/asio/ip/host_name.hpp | 2 +- asio/asio/ip/icmp.hpp | 2 +- asio/asio/ip/impl/address.hpp | 2 +- asio/asio/ip/impl/address.ipp | 2 +- asio/asio/ip/impl/address_v4.hpp | 2 +- asio/asio/ip/impl/address_v4.ipp | 2 +- asio/asio/ip/impl/address_v6.hpp | 2 +- asio/asio/ip/impl/address_v6.ipp | 2 +- asio/asio/ip/impl/basic_endpoint.hpp | 2 +- asio/asio/ip/impl/host_name.ipp | 2 +- asio/asio/ip/multicast.hpp | 2 +- asio/asio/ip/resolver_query_base.hpp | 2 +- asio/asio/ip/resolver_service.hpp | 2 +- asio/asio/ip/tcp.hpp | 2 +- asio/asio/ip/udp.hpp | 2 +- asio/asio/ip/unicast.hpp | 2 +- asio/asio/ip/v6_only.hpp | 2 +- asio/asio/is_read_buffered.hpp | 2 +- asio/asio/is_write_buffered.hpp | 2 +- asio/asio/local/basic_endpoint.hpp | 2 +- asio/asio/local/connect_pair.hpp | 2 +- asio/asio/local/datagram_protocol.hpp | 2 +- asio/asio/local/detail/endpoint.hpp | 2 +- asio/asio/local/detail/impl/endpoint.ipp | 2 +- asio/asio/local/stream_protocol.hpp | 2 +- asio/asio/placeholders.hpp | 2 +- asio/asio/posix/basic_descriptor.hpp | 2 +- asio/asio/posix/basic_stream_descriptor.hpp | 2 +- asio/asio/posix/descriptor_base.hpp | 2 +- asio/asio/posix/stream_descriptor.hpp | 2 +- asio/asio/posix/stream_descriptor_service.hpp | 2 +- asio/asio/raw_socket_service.hpp | 2 +- asio/asio/read.hpp | 2 +- asio/asio/read_at.hpp | 2 +- asio/asio/read_until.hpp | 2 +- asio/asio/seq_packet_socket_service.hpp | 2 +- asio/asio/serial_port.hpp | 2 +- asio/asio/serial_port_base.hpp | 2 +- asio/asio/serial_port_service.hpp | 2 +- asio/asio/signal_set.hpp | 2 +- asio/asio/signal_set_service.hpp | 2 +- asio/asio/socket_acceptor_service.hpp | 2 +- asio/asio/socket_base.hpp | 2 +- asio/asio/spawn.hpp | 2 +- asio/asio/ssl.hpp | 2 +- asio/asio/ssl/basic_context.hpp | 2 +- asio/asio/ssl/context.hpp | 2 +- asio/asio/ssl/context_base.hpp | 2 +- asio/asio/ssl/context_service.hpp | 2 +- asio/asio/ssl/detail/buffered_handshake_op.hpp | 2 +- asio/asio/ssl/detail/engine.hpp | 2 +- asio/asio/ssl/detail/handshake_op.hpp | 2 +- asio/asio/ssl/detail/impl/engine.ipp | 12 +- asio/asio/ssl/detail/impl/openssl_init.ipp | 44 +- asio/asio/ssl/detail/io.hpp | 2 +- asio/asio/ssl/detail/openssl_init.hpp | 2 +- asio/asio/ssl/detail/openssl_types.hpp | 4 +- asio/asio/ssl/detail/password_callback.hpp | 2 +- asio/asio/ssl/detail/read_op.hpp | 2 +- asio/asio/ssl/detail/shutdown_op.hpp | 2 +- asio/asio/ssl/detail/stream_core.hpp | 2 +- asio/asio/ssl/detail/verify_callback.hpp | 2 +- asio/asio/ssl/detail/write_op.hpp | 2 +- asio/asio/ssl/error.hpp | 42 +- asio/asio/ssl/impl/context.hpp | 2 +- asio/asio/ssl/impl/context.ipp | 100 +- asio/asio/ssl/impl/error.ipp | 47 +- asio/asio/ssl/impl/rfc2818_verification.ipp | 2 +- asio/asio/ssl/impl/src.hpp | 2 +- asio/asio/ssl/old/basic_context.hpp | 2 +- asio/asio/ssl/old/context_service.hpp | 2 +- .../ssl/old/detail/openssl_context_service.hpp | 10 +- .../asio/ssl/old/detail/openssl_stream_service.hpp | 2 +- asio/asio/ssl/old/stream.hpp | 2 +- asio/asio/ssl/old/stream_service.hpp | 2 +- asio/asio/ssl/rfc2818_verification.hpp | 2 +- asio/asio/ssl/stream.hpp | 2 +- asio/asio/ssl/stream_base.hpp | 2 +- asio/asio/ssl/stream_service.hpp | 2 +- asio/asio/ssl/verify_context.hpp | 2 +- asio/asio/ssl/verify_mode.hpp | 2 +- asio/asio/steady_timer.hpp | 2 +- asio/asio/strand.hpp | 2 +- asio/asio/stream_socket_service.hpp | 2 +- asio/asio/streambuf.hpp | 2 +- asio/asio/system_error.hpp | 2 +- asio/asio/system_timer.hpp | 2 +- asio/asio/thread.hpp | 2 +- asio/asio/time_traits.hpp | 2 +- asio/asio/unyield.hpp | 2 +- asio/asio/use_future.hpp | 2 +- asio/asio/version.hpp | 4 +- asio/asio/wait_traits.hpp | 2 +- asio/asio/waitable_timer_service.hpp | 2 +- asio/asio/windows/basic_handle.hpp | 2 +- asio/asio/windows/basic_object_handle.hpp | 2 +- asio/asio/windows/basic_random_access_handle.hpp | 2 +- asio/asio/windows/basic_stream_handle.hpp | 2 +- asio/asio/windows/object_handle.hpp | 2 +- asio/asio/windows/object_handle_service.hpp | 2 +- asio/asio/windows/overlapped_ptr.hpp | 2 +- asio/asio/windows/random_access_handle.hpp | 2 +- asio/asio/windows/random_access_handle_service.hpp | 2 +- asio/asio/windows/stream_handle.hpp | 2 +- asio/asio/windows/stream_handle_service.hpp | 2 +- asio/asio/write.hpp | 2 +- asio/asio/write_at.hpp | 2 +- asio/asio/yield.hpp | 2 +- common/wsrep_api.h | 1270 ------------ debian/control | 33 +- debian/{galera-3.docs => galera-4.docs} | 0 debian/{galera-3.install => galera-4.install} | 0 debian/{galera-3.links => galera-4.links} | 0 ...rb.default => galera-arbitrator-4.garb.default} | 0 ...r-3.garb.init => galera-arbitrator-4.garb.init} | 0 debian/rules | 4 +- galera/src/SConscript | 3 +- galera/src/certification.cpp | 872 +++++++-- galera/src/certification.hpp | 84 +- galera/src/fsm.hpp | 47 +- galera/src/galera_gcs.hpp | 43 +- galera/src/galera_info.cpp | 89 +- galera/src/galera_info.hpp | 12 +- galera/src/galera_service_thd.hpp | 3 +- galera/src/galera_view.cpp | 33 + galera/src/galera_view.hpp | 54 + galera/src/gcs_action_source.cpp | 140 +- galera/src/gcs_action_source.hpp | 34 +- galera/src/gcs_dummy.cpp | 74 +- galera/src/ist.cpp | 83 +- galera/src/ist.hpp | 16 +- galera/src/ist_proto.hpp | 84 +- galera/src/key_entry_ng.hpp | 47 +- galera/src/key_entry_os.cpp | 8 +- galera/src/key_entry_os.hpp | 34 +- galera/src/key_set.cpp | 77 +- galera/src/key_set.hpp | 91 +- galera/src/monitor.hpp | 28 +- galera/src/nbo.hpp | 191 ++ galera/src/replicator.hpp | 38 +- galera/src/replicator_smm.cpp | 2044 ++++++++++++++------ galera/src/replicator_smm.hpp | 236 ++- galera/src/replicator_smm_params.cpp | 9 +- galera/src/replicator_smm_stats.cpp | 89 +- galera/src/replicator_str.cpp | 488 ++++- galera/src/saved_state.cpp | 41 +- galera/src/saved_state.hpp | 33 +- galera/src/trx_handle.cpp | 464 +++-- galera/src/trx_handle.hpp | 1231 ++++++++---- galera/src/uuid.hpp | 59 - galera/src/write_set.cpp | 5 + galera/src/write_set.hpp | 4 +- galera/src/write_set_ng.cpp | 5 +- galera/src/write_set_ng.hpp | 43 +- galera/src/wsdb.cpp | 42 +- galera/src/wsdb.hpp | 47 +- galera/src/wsrep_params.cpp | 3 +- galera/src/wsrep_provider.cpp | 405 ++-- galera/tests/SConscript | 1 + galera/tests/certification_check.cpp | 491 +++++ galera/tests/galera_check.cpp | 5 +- galera/tests/ist_check.cpp | 95 +- galera/tests/key_set_check.cpp | 120 +- galera/tests/test_key.hpp | 22 +- galera/tests/trx_handle_check.cpp | 405 ++-- galera/tests/write_set_check.cpp | 6 +- galera/tests/write_set_ng_check.cpp | 36 +- galerautils/src/gu_asio.cpp | 47 +- galerautils/src/gu_digest.hpp | 1 - galerautils/src/gu_mmh3.h | 4 + galerautils/src/gu_shared_ptr.hpp | 17 + galerautils/src/gu_vec16.h | 96 - galerautils/tests/SConscript | 9 +- galerautils/tests/gu_tests.c | 2 - galerautils/tests/gu_vec_test.c | 53 - galerautils/tests/gu_vec_test.h | 12 - garb/garb_gcs.cpp | 2 +- garb/garb_gcs.hpp | 4 +- garb/garb_recv_loop.cpp | 42 +- garb/garb_recv_loop.hpp | 3 +- gcomm/src/evs_proto.cpp | 3 +- gcomm/src/evs_proto.hpp | 3 +- gcomm/src/gcomm/protolay.hpp | 7 +- gcomm/src/gcomm/protonet.hpp | 3 +- gcomm/src/gcomm/protostack.hpp | 3 +- gcomm/src/gmcast.cpp | 9 +- gcomm/src/gmcast.hpp | 3 +- gcomm/src/pc_proto.cpp | 44 +- gcomm/src/pc_proto.hpp | 66 +- gcomm/src/protonet.cpp | 5 +- gcomm/src/protostack.cpp | 5 +- gcomm/src/view.cpp | 18 +- gcomm/test/check_evs2.cpp | 24 +- gcomm/test/check_pc.cpp | 31 +- gcs/src/SConscript | 1 + gcs/src/gcs.cpp | 318 ++- gcs/src/gcs.hpp | 91 +- gcs/src/gcs_act.hpp | 4 +- gcs/src/gcs_act_cchange.cpp | 292 +++ gcs/src/gcs_core.cpp | 159 +- gcs/src/gcs_core.hpp | 15 +- gcs/src/gcs_fifo_lite.cpp | 4 +- gcs/src/gcs_gcomm.cpp | 29 +- gcs/src/gcs_group.cpp | 438 ++++- gcs/src/gcs_group.hpp | 21 +- gcs/src/gcs_msg_type.cpp | 3 +- gcs/src/gcs_msg_type.hpp | 7 +- gcs/src/gcs_node.cpp | 70 +- gcs/src/gcs_node.hpp | 31 +- gcs/src/gcs_params.cpp | 4 +- gcs/src/gcs_state_msg.cpp | 69 +- gcs/src/gcs_state_msg.hpp | 22 +- gcs/src/gcs_test.cpp | 65 +- gcs/src/unit_tests/SConscript | 2 + gcs/src/unit_tests/gcs_act_cchange_test.cpp | 118 ++ gcs/src/unit_tests/gcs_act_cchange_test.hpp | 12 + gcs/src/unit_tests/gcs_backend_test.cpp | 9 +- gcs/src/unit_tests/gcs_backend_test.hpp | 2 +- gcs/src/unit_tests/gcs_comp_test.cpp | 10 +- gcs/src/unit_tests/gcs_comp_test.hpp | 4 +- gcs/src/unit_tests/gcs_core_test.cpp | 105 +- gcs/src/unit_tests/gcs_defrag_test.cpp | 11 +- gcs/src/unit_tests/gcs_defrag_test.hpp | 2 +- gcs/src/unit_tests/gcs_fc_test.cpp | 6 +- gcs/src/unit_tests/gcs_fifo_test.cpp | 7 +- gcs/src/unit_tests/gcs_fifo_test.hpp | 2 +- gcs/src/unit_tests/gcs_group_test.cpp | 24 +- gcs/src/unit_tests/gcs_memb_test.cpp | 10 +- gcs/src/unit_tests/gcs_node_test.hpp | 2 +- gcs/src/unit_tests/gcs_proto_test.cpp | 8 +- gcs/src/unit_tests/gcs_proto_test.hpp | 2 +- gcs/src/unit_tests/gcs_state_msg_test.cpp | 102 +- gcs/src/unit_tests/gcs_tests.cpp | 2 + scripts/mysql/build.sh | 1 + scripts/mysql/mysql-galera | 8 +- scripts/mysql/rpm.sh | 2 +- scripts/packages/galera-dev.list | 2 +- scripts/packages/galera-obs.spec | 19 +- tests/run_sqlgen.sh | 36 + tests/scripts/install.sh | 6 +- wsrep/src | 1 + 539 files changed, 9111 insertions(+), 4850 deletions(-) diff --cc SConstruct index 5f0f20a9,32f5476c..7fbc3d57 --- a/SConstruct +++ b/SConstruct @@@ -72,8 -72,8 +72,9 @@@ Commandline Options revno=XXXX source code revision number bpostatic=path a path to static libboost_program_options.a extra_sysroot=path a path to extra development environment (Fink, Homebrew, MacPorts, MinGW) + version=X.X.X galera version bits=[32bit|64bit] + gcov=[True|False] compile Galera for code coverage reporting ''') # bpostatic option added on Percona request diff --cc debian/rules index be915db2,0b2c532e..1cd3d9ef --- a/debian/rules +++ b/debian/rules @@@ -58,12 -46,9 +58,12 @@@ override_dh_installinit-arch dh_installinit -n --name=garb -- defaults 18 22 override_dh_strip: - dh_strip -pgalera-3 --dbg-package=galera-3-dbg - dh_strip -pgalera-arbitrator-3 --dbg-package=galera-arbitrator-3-dbg + dh_strip -pgalera-4 --dbg-package=galera-4-dbg + dh_strip -pgalera-arbitrator-4 --dbg-package=galera-arbitrator-4-dbg +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + %: dh $@