diff options
| author | David Hows <howsdav@gmail.com> | 2016-07-11 23:52:52 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-07-29 16:12:45 +1000 |
| commit | 3dc8860451a88f531c94cf18b38df5a7a6487380 (patch) | |
| tree | a357aa043466d393aa7e41e38dd30436a5197af6 | |
| parent | 9383fc98ee5c2087eb1ac4f8ec6eb446e08fd79e (diff) | |
| download | mongo-3dc8860451a88f531c94cf18b38df5a7a6487380.tar.gz | |
WT-2711 Remove posix expanded strftime values and use older C89 values (#2865)
* WT-2711 Remove posix expanded strftime values and use older C89 values
* Fix issues with s_string
* Add a comment so nobody rewrites the strftime format and reintroduces the bug.
* Fix strings sort order.
(cherry picked from commit 1c67c4e0f011f2a7f7ca582b4c2e6f6154ac3b20)
| -rw-r--r-- | dist/s_string.ok | 1 | ||||
| -rw-r--r-- | src/conn/conn_stat.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/dist/s_string.ok b/dist/s_string.ok index 85ccf9f95c7..0740462b863 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -529,6 +529,7 @@ cust customp cv cxa +dT data's database's datalen diff --git a/src/conn/conn_stat.c b/src/conn/conn_stat.c index 9b51bcba703..566a5397a43 100644 --- a/src/conn/conn_stat.c +++ b/src/conn/conn_stat.c @@ -198,9 +198,12 @@ __statlog_config(WT_SESSION_IMPL *session, const char **cfg, bool *runp) * call, or vice-versa, we will incorrectly switch to the JSON default * timestamp. But there's no way to detect that, and this is all a low * probability path.) + * + * !!! + * Don't rewrite in the compressed "%FT%T.000Z" form, MSVC13 segfaults. */ #define WT_TIMESTAMP_DEFAULT "%b %d %H:%M:%S" -#define WT_TIMESTAMP_JSON_DEFAULT "%FT%T.000Z" +#define WT_TIMESTAMP_JSON_DEFAULT "%Y-%m-%dT%H:%M:%S.000Z" WT_ERR(__wt_config_gets( session, cfg, "statistics_log.timestamp", &cval)); if (FLD_ISSET(conn->stat_flags, WT_CONN_STAT_JSON) && |