diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
| commit | d5d8756de3fa640b69793068937c0293587b16ee (patch) | |
| tree | 6fa32a78ae8bed380cee057f1f098633fde47df5 /sql/tztime.cc | |
| parent | b205e478a3ba7dfce69bba9e6187d412823b4949 (diff) | |
| parent | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (diff) | |
| download | mariadb-git-d5d8756de3fa640b69793068937c0293587b16ee.tar.gz | |
Merge 10.4 into 10.5
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 4546f2291cd..8e08a201e88 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2753,9 +2753,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 " @@ -2763,6 +2765,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 " |