Conflicts:
	mysql-test/collections/mysql-8.0-stage.push
	mysql-test/include/mysqld--help.inc
	packaging/rpm-docker/mysql.spec.in
	packaging/rpm-fedora/mysql.spec.in
	packaging/rpm-oel/mysql.spec.in
	packaging/rpm-sles/mysql.spec.in
	rapid/plugin/x/client/mysqlxclient/xsession.h
	rapid/plugin/x/client/xconnection_impl.cc
	rapid/plugin/x/ngs/include/ngs/command_delegate.h
	rapid/plugin/x/ngs/include/ngs/error_code.h
	rapid/plugin/x/ngs/include/ngs_common/socket_interface.h
	rapid/plugin/x/ngs/ngs_common/operations_factory.cc
	rapid/plugin/x/ngs/src/client.cc
	rapid/plugin/x/ngs/src/protocol/row_builder.cc
	rapid/plugin/x/ngs/src/socket_events.cc
	rapid/plugin/x/protocol/CMakeLists.txt
	rapid/plugin/x/src/mysql_show_variable_wrapper.cc
	rapid/plugin/x/src/mysql_show_variable_wrapper.h
	rapid/plugin/x/src/mysql_variables.h
	rapid/plugin/x/src/query_formatter.cc
	rapid/plugin/x/src/query_formatter.h
	rapid/plugin/x/src/query_string_builder.cc
	rapid/plugin/x/src/query_string_builder.h
	rapid/plugin/x/src/sql_data_context.cc
	rapid/plugin/x/src/sql_data_context.h
	rapid/plugin/x/src/xpl_client.cc
	rapid/plugin/x/src/xpl_client.h
	rapid/plugin/x/src/xpl_performance_schema.h
	rapid/plugin/x/src/xpl_plugin.cc
	rapid/plugin/x/src/xpl_server.cc
	rapid/plugin/x/src/xpl_server.h
	rapid/plugin/x/src/xpl_system_variables.h
	rapid/plugin/x/tests/driver/common/utils_string_parsing.h
	rapid/plugin/x/tests/driver/driver_command_line_options.cc
	rapid/plugin/x/tests/driver/processor/script_stack.h
	rapid/plugin/x/tests/mtr/t/admin_list_objects_docpath.test
	rapid/unittest/gunit/xplugin/test_main.cc
	rapid/unittest/gunit/xplugin/xpl/callback_command_delegate_t.cc
	rapid/unittest/gunit/xplugin/xpl/row_builder_t.cc
	rapid/unittest/gunit/xplugin/xpl/stubs/command_service.cc
	rapid/unittest/gunit/xplugin/xpl/stubs/log_subsystem.cc
	rapid/unittest/gunit/xplugin/xpl/stubs/misc.cc
	rapid/unittest/gunit/xplugin/xpl/stubs/security_context_service.cc
	rapid/unittest/gunit/xplugin/xpl/stubs/sql_session_service.cc
	rapid/unittest/gunit/xplugin/xpl/xdatetime_t.cc
	rapid/unittest/gunit/xplugin/xpl/xdecimal_t.cc