Skip to content

Commit 584941b

Browse files
authored
Merge pull request #2 from LMDB/mdb.master
Merge from upstream
2 parents 6ea45a7 + 45745fc commit 584941b

25 files changed

+357
-207
lines changed

libraries/liblmdb/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mdb_copy
55
mdb_stat
66
mdb_dump
77
mdb_load
8+
mdb_drop
89
*.lo
910
*.[ao]
1011
*.so

libraries/liblmdb/COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2011-2019 Howard Chu, Symas Corp.
1+
Copyright 2011-2021 Howard Chu, Symas Corp.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

libraries/liblmdb/intro.doc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 Howard Chu, Symas Corp.
2+
* Copyright 2015-2021 Howard Chu, Symas Corp.
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without

libraries/liblmdb/lmdb.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
*
137137
* @author Howard Chu, Symas Corporation.
138138
*
139-
* @copyright Copyright 2011-2019 Howard Chu, Symas Corp. All rights reserved.
139+
* @copyright Copyright 2011-2021 Howard Chu, Symas Corp. All rights reserved.
140140
*
141141
* Redistribution and use in source and binary forms, with or without
142142
* modification, are permitted only as authorized by the OpenLDAP
@@ -610,7 +610,7 @@ int mdb_env_create(MDB_env **env);
610610
* <li>#MDB_NOTLS
611611
* Don't use Thread-Local Storage. Tie reader locktable slots to
612612
* #MDB_txn objects instead of to threads. I.e. #mdb_txn_reset() keeps
613-
* the slot reseved for the #MDB_txn object. A thread may use parallel
613+
* the slot reserved for the #MDB_txn object. A thread may use parallel
614614
* read-only transactions. A read-only transaction may span threads if
615615
* the user synchronizes its use. Applications that multiplex many
616616
* user threads over individual OS threads need this option. Such an
@@ -968,7 +968,7 @@ void *mdb_env_get_userctx(MDB_env *env);
968968
typedef void MDB_assert_func(MDB_env *env, const char *msg);
969969

970970
/** Set or reset the assert() callback of the environment.
971-
* Disabled if liblmdb is buillt with NDEBUG.
971+
* Disabled if liblmdb is built with NDEBUG.
972972
* @note This hack should become obsolete as lmdb's error handling matures.
973973
* @param[in] env An environment handle returned by #mdb_env_create().
974974
* @param[in] func An #MDB_assert_func function, or 0.

0 commit comments

Comments
 (0)