diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
| commit | c06845d6f04e092b64c105eb6786056cea2ab593 (patch) | |
| tree | cfd3f3abc32ab96fb918d3c00ffc68f072ca29bc /sql/mysqld.cc | |
| parent | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (diff) | |
| parent | edbdfc2f995eb47ba49235195aca00888aeacbc4 (diff) | |
| download | mariadb-git-c06845d6f04e092b64c105eb6786056cea2ab593.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9cc841be735..5878f4a2286 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2019, MariaDB Corporation. + Copyright (c) 2008, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -5922,8 +5922,10 @@ int mysqld_main(int argc, char **argv) set_user(mysqld_user, user_info); } +#ifdef WITH_WSREP if (WSREP_ON && wsrep_check_opts()) global_system_variables.wsrep_on= 0; +#endif /* The subsequent calls may take a long time : e.g. innodb log read. |