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/sql_base.cc | |
| parent | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (diff) | |
| parent | edbdfc2f995eb47ba49235195aca00888aeacbc4 (diff) | |
| download | mariadb-git-c06845d6f04e092b64c105eb6786056cea2ab593.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 761c4daa88b..f31c3f36aa8 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, MariaDB + Copyright (c) 2010, 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 @@ -4190,7 +4190,7 @@ restart: } } - if (WSREP_ON && + if (WSREP(thd) && wsrep_replicate_myisam && (*start) && (*start)->table && |