diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-13 13:30:03 +0300 |
| commit | db0cfba638383569b1e30765e2d36e0707bfb930 (patch) | |
| tree | d56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/tztime.cc | |
| parent | 0a9216835f406947fb4d492616da4cda75e5e113 (diff) | |
| parent | a057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff) | |
| download | mariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz | |
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 5e1e8bec7b3..f5e9182522e 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2559,7 +2559,7 @@ main(int argc, char **argv) if (argc == 2) { - root_name_end= strmake(fullname, argv[1], FN_REFLEN); + root_name_end= strmake_buf(fullname, argv[1]); printf("TRUNCATE TABLE time_zone;\n"); printf("TRUNCATE TABLE time_zone_name;\n"); @@ -2713,7 +2713,7 @@ main(int argc, char **argv) (int)t, (int)t1); /* Let us load time zone description */ - str_end= strmake(fullname, TZDIR, FN_REFLEN); + str_end= strmake_buf(fullname, TZDIR); strmake(str_end, "/MET", FN_REFLEN - (str_end - fullname)); if (tz_load(fullname, &tz_info, &tz_storage)) |