diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
| commit | bfba2bce6a350e2893c76e42415ac733c39a3976 (patch) | |
| tree | 755c71d2936863d0d59be892902fd481e5207691 /sql/tztime.cc | |
| parent | 309302a3dad5f06cb62b0846dcb8a3671d91ff29 (diff) | |
| parent | ece0b0623c9c14a2a1de61c53be9e1bcc2b6216c (diff) | |
| download | mariadb-git-bfba2bce6a350e2893c76e42415ac733c39a3976.tar.gz | |
Merge 10.1 into 10.2
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 35e18f47629..067348dccab 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2747,9 +2747,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 " @@ -2757,6 +2759,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 " |