diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
commit | eae968f62d285de97ed607c87bc131cd863d5d03 (patch) | |
tree | b86dacfaf9e1340161d3675204544a4db937eb05 /mysql-test/suite/wsrep | |
parent | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (diff) | |
parent | bafc5c1321a7dff5f2da292111bf98fed9d1658d (diff) | |
download | mariadb-git-eae968f62d285de97ed607c87bc131cd863d5d03.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/wsrep')
-rw-r--r-- | mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result index ffd6c3cab1f..f219625b490 100644 --- a/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result +++ b/mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result @@ -85,6 +85,15 @@ END IF| # # Testing with explicit timezonefile # +\d | +IF (select count(*) from information_schema.global_variables where +variable_name='wsrep_on' and variable_value='ON') = 1 THEN +ALTER TABLE time_zone ENGINE=InnoDB; +ALTER TABLE time_zone_name ENGINE=InnoDB; +ALTER TABLE time_zone_transition ENGINE=InnoDB; +ALTER TABLE time_zone_transition_type ENGINE=InnoDB; +END IF| +\d ; INSERT INTO time_zone (Use_leap_seconds) VALUES ('N'); SET @time_zone_id= LAST_INSERT_ID(); INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id); @@ -106,6 +115,15 @@ END IF| \d | IF (select count(*) from information_schema.global_variables where variable_name='wsrep_on' and variable_value='ON') = 1 THEN +ALTER TABLE time_zone ENGINE=InnoDB; +ALTER TABLE time_zone_name ENGINE=InnoDB; +ALTER TABLE time_zone_transition ENGINE=InnoDB; +ALTER TABLE time_zone_transition_type ENGINE=InnoDB; +END IF| +\d ; +\d | +IF (select count(*) from information_schema.global_variables where +variable_name='wsrep_on' and variable_value='ON') = 1 THEN ALTER TABLE time_zone_leap_second ENGINE=InnoDB; END IF| \d ; |