Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I872d94121a89a210c63d0502b357deec9b476443

Author: weigon

router/src/routing/src/mysql_routing.cc

@@ -708,8 +708,8 @@ void MySQLRouting::run(mysql_harness::PluginFuncEnv *env) {
     auto res = run_acceptor(env);
     if (!res) {
       clear_running(env);
-      throw std::runtime_error(string_format(
-          "Failed setting up acceptor services: %s", res.error().c_str()));
+
+      throw std::runtime_error(res.error());
     }
   }
 }

router/tests/component/test_router_configuration_errors.cc

@@ -438,8 +438,8 @@ static const BrokenConfigParams broken_config_params_unix[]{
                  {"socket", "/this/path/does/not/exist/socket"},
              }),
      },
-     "Failed setting up acceptor services: Failed setting up acceptor on "
-     "'/this/path/does/not/exist/socket': No such file or directory",
+     "Failed setting up acceptor on '/this/path/does/not/exist/socket': "
+     "No such file or directory",
      ""},
 };