diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 11:01:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 11:01:47 +0300 |
| commit | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (patch) | |
| tree | e1e69ba81d7dd1b170b8572edc6e7625b38567b8 /sql/tztime.cc | |
| parent | f8bf5b0f8431493975f8f4488d0bef6e0e4e289e (diff) | |
| parent | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (diff) | |
| download | mariadb-git-2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 9465a51f3fe..05b8389a521 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2739,9 +2739,11 @@ main(int argc, char **argv) printf("TRUNCATE TABLE time_zone_name;\n"); printf("TRUNCATE TABLE time_zone_transition;\n"); printf("TRUNCATE TABLE time_zone_transition_type;\n"); + printf("START TRANSACTION;\n"); if (scan_tz_dir(root_name_end, 0, opt_verbose)) { + printf("ROLLBACK;\n"); fflush(stdout); fprintf(stderr, "There were fatal errors during processing " @@ -2749,6 +2751,7 @@ main(int argc, char **argv) return 1; } + printf("COMMIT;\n"); printf("ALTER TABLE time_zone_transition " "ORDER BY Time_zone_id, Transition_time;\n"); printf("ALTER TABLE time_zone_transition_type " |