diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
commit | 22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch) | |
tree | d39436232e232c5a5beb996e86e2b34b05ab5115 /mysql-test/main/mysql_tzinfo_to_sql_symlink.test | |
parent | bfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff) | |
parent | 75d631f333544de4487a6dd251d6f361e1d55d6b (diff) | |
download | mariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz |
Merge branch '10.8' into 10.9
Diffstat (limited to 'mysql-test/main/mysql_tzinfo_to_sql_symlink.test')
-rw-r--r-- | mysql-test/main/mysql_tzinfo_to_sql_symlink.test | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test index 857f24e610f..34df1281c38 100644 --- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test +++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test @@ -3,8 +3,6 @@ --source include/not_windows.inc --source include/no_protocol.inc -let $is_embedded=`select version() like '%embedded%'`; - CREATE TABLE time_zone LIKE mysql.time_zone; CREATE TABLE time_zone_name LIKE mysql.time_zone_name; CREATE TABLE time_zone_transition LIKE mysql.time_zone_transition; @@ -63,9 +61,6 @@ SELECT COUNT(*) FROM time_zone_transition; SELECT COUNT(*) FROM time_zone_transition_type; SELECT COUNT(*) FROM time_zone_leap_second; -if ($is_embedded) { ---replace_column 1 0 2 0 -} SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@SQL_LOG_BIN; SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff FROM information_schema.global_status g @@ -100,9 +95,6 @@ SELECT COUNT(*) FROM time_zone_transition; SELECT COUNT(*) FROM time_zone_transition_type; SELECT COUNT(*) FROM time_zone_leap_second; -if ($is_embedded) { ---replace_column 1 0 2 0 -} SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@SQL_LOG_BIN; SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff FROM information_schema.global_status g @@ -135,9 +127,6 @@ SELECT COUNT(*) FROM time_zone_transition; SELECT COUNT(*) FROM time_zone_transition_type; SELECT COUNT(*) FROM time_zone_leap_second; -if ($is_embedded) { ---replace_column 1 0 2 0 -} SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@SQL_LOG_BIN; SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff FROM information_schema.global_status g @@ -170,9 +159,6 @@ SELECT COUNT(*) FROM time_zone_transition; SELECT COUNT(*) FROM time_zone_transition_type; SELECT COUNT(*) FROM time_zone_leap_second; -if ($is_embedded) { ---replace_column 1 0 2 0 -} SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@SQL_LOG_BIN; SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff FROM information_schema.global_status g @@ -205,9 +191,6 @@ SELECT COUNT(*) FROM time_zone_transition; SELECT COUNT(*) FROM time_zone_transition_type; SELECT COUNT(*) FROM time_zone_leap_second; -if ($is_embedded) { ---replace_column 1 0 2 0 -} SELECT @wsrep_is_on, @wsrep_cannot_replicate_tz, @save_wsrep_on, @save_sql_log_bin, @@SQL_LOG_BIN; SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff FROM information_schema.global_status g |