diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-21 18:19:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-21 18:19:24 +0300 |
| commit | 54ac356deab14d6b9433af00da8fe82f9aaaccb8 (patch) | |
| tree | eb9a41fbff5a53471228277488f97ef44b438844 /sql/tztime.cc | |
| parent | 325e6aa7af04916b50671fa5be1779ba8de00545 (diff) | |
| parent | 6680fd8d4b1f5fa8488608ca9e528e56f338dba4 (diff) | |
| download | mariadb-git-54ac356deab14d6b9433af00da8fe82f9aaaccb8.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index ae71a0e91c9..5dc3826f0d6 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2730,11 +2730,11 @@ static const char *trunc_tables_const= "TRUNCATE TABLE time_zone_transition;\n" "TRUNCATE TABLE time_zone_transition_type;\n"; static const char *wsrep_is_on= - "select sum(VARIABLE_NAME='wsrep_on' AND SESSION_VALUE='ON')" - " from information_schema.SYSTEM_VARIABLES"; + "select sum(SESSION_VALUE='ON')" + " from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on'"; static const char *wsrep_cannot_replicate_tz= - "select sum(VARIABLE_NAME='wsrep_mode' and GLOBAL_VALUE NOT LIKE @replicate_opt)" - " from information_schema.SYSTEM_VARIABLES"; + "select sum(GLOBAL_VALUE NOT LIKE @replicate_opt)" + " from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode'"; int main(int argc, char **argv) |