lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:mdbtools/mdbtools into dev

Browse Source
This commit is contained in:
Evan Miller 2020-11-12 16:26:48 -05:00
commit 509831205b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libmdb/options.c
View File

@ -24,8 +24,8 @@
#define DEBUG 1 #define DEBUG 1
static unsigned long opts; static __thread unsigned long opts;
static int optset; static __thread int optset;
static void load_options(void); static void load_options(void);
@ -50,9 +50,10 @@ load_options()
{ {
char *opt; char *opt;
char *s; char *s;
char *ctx;
if (!optset && (s=getenv("MDBOPTS"))) { if (!optset && (s=getenv("MDBOPTS"))) {
opt = strtok(s, ":"); opt = strtok_r(s, ":", &ctx);
while (opt) { while (opt) {
if (!strcmp(opt, "use_index")) opts |= MDB_USE_INDEX; if (!strcmp(opt, "use_index")) opts |= MDB_USE_INDEX;
if (!strcmp(opt, "no_memo")) opts |= MDB_NO_MEMO; if (!strcmp(opt, "no_memo")) opts |= MDB_NO_MEMO;
@ -70,7 +71,7 @@ load_options()
opts |= MDB_DEBUG_ROW; opts |= MDB_DEBUG_ROW;
opts |= MDB_DEBUG_PROPS; opts |= MDB_DEBUG_PROPS;
} }
opt = strtok(NULL,":"); opt = strtok_r(NULL,":", &ctx);
} }
} }
optset = 1; optset = 1;

5
src/sql/mdbsql.c
View File

@ -760,8 +760,9 @@ int mdb_sql_find_sargcol(MdbSargNode *node, gpointer data)
* Plain integers are UNIX timestamps for backwards compatibility of parser * Plain integers are UNIX timestamps for backwards compatibility of parser
*/ */
if (col->col_type == MDB_DATETIME && node->val_type == MDB_INT) { if (col->col_type == MDB_DATETIME && node->val_type == MDB_INT) {
struct tm *tm = gmtime((time_t*)&node->value.i); struct tm tm;
mdb_tm_to_date(tm, &node->value.d); gmtime_r((time_t*)&node->value.i, &tm);
mdb_tm_to_date(&tm, &node->value.d);
node->val_type = MDB_DOUBLE; node->val_type = MDB_DOUBLE;
} }
} }