diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-10 11:53:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-10 14:01:23 +0200 |
| commit | 3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff (patch) | |
| tree | ad189995a78fdc6068059e65b8455d3d4e61e719 /mysql-test/main/mysql_tzinfo_to_sql_symlink.test | |
| parent | f4d671bff2c4dcfe1bb2af6d40122576e4fcfa91 (diff) | |
| parent | fe3d07cab82b2215dc64f52ac93122072c33d021 (diff) | |
| download | mariadb-git-3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'mysql-test/main/mysql_tzinfo_to_sql_symlink.test')
| -rw-r--r-- | mysql-test/main/mysql_tzinfo_to_sql_symlink.test | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test index a2ce9e8f9b9..34df1281c38 100644 --- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test +++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test @@ -198,6 +198,23 @@ SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff ORDER BY g.VARIABLE_NAME; --echo # +--echo # MDEV-28263: mariadb-tzinfo-to-sql improve wsrep and binlog cases +--echo # + +--echo # +--echo # Testing --skip-write-binlog +--echo # + +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog $MYSQLTEST_VARDIR/zoneinfo/GMT XXX 2>&1 + +--exec $MYSQL_TZINFO_TO_SQL --skip-write-binlog --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>&1 + +--echo # +--echo # End of 10.2 tests +--echo # + +--echo # --echo # MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL --echo # --exec rm -rf $MYSQLTEST_VARDIR/zoneinfo @@ -208,7 +225,6 @@ SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff --exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>&1 # -# # Cleanup # |