diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 22:42:35 +0200 |
commit | 78829a5780d3e48da376c1ca4e62731da450c551 (patch) | |
tree | 6561f2b6f09662220b9965bb14d745f69a4ecd34 /sql/mysqld.cc | |
parent | d6ba8496175a2dd85d772f8486eb032c31969f59 (diff) | |
parent | 947b6b849d907dc0793f076aec7e553869db744f (diff) | |
download | mariadb-git-78829a5780d3e48da376c1ca4e62731da450c551.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 216b5d1c622..a338805795d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5498,7 +5498,8 @@ static int init_server_components() initialized. This initialization was not possible before, as plugins (and thus some global system variables) are initialized after wsrep startup threads are created. - Note: This only needs to be done for rsync, xtrabackup based SST methods. + Note: This only needs to be done for rsync and mariabackup based SST + methods. */ if (wsrep_before_SE()) wsrep_plugins_post_init(); |