Skip to content

Commit 2e1014c

Browse files
Nic WatsonNic Watson
authored andcommitted
Update py-lmdb patch for lmdb 0.9.31
1 parent 4f1cc09 commit 2e1014c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

lib/py-lmdb/env-copy-txn.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
2-
index 69aa2751a2..ff7f77a10d 100644
2+
index ff03c22..3d6f4cc 100644
33
--- a/libraries/liblmdb/lmdb.h
44
+++ b/libraries/liblmdb/lmdb.h
55
@@ -682,9 +682,14 @@ int mdb_env_copyfd(MDB_env *env, mdb_filehandle_t fd);
@@ -32,10 +32,10 @@ index 69aa2751a2..ff7f77a10d 100644
3232
/** @brief Return statistics about the LMDB environment.
3333
*
3434
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
35-
index 8cecdb2e69..9ede4183dd 100644
35+
index deb6779..b5d152c 100644
3636
--- a/libraries/liblmdb/mdb.c
3737
+++ b/libraries/liblmdb/mdb.c
38-
@@ -9332,12 +9332,12 @@ done:
38+
@@ -9366,12 +9366,12 @@ done:
3939

4040
/** Copy environment with compaction. */
4141
static int ESECT
@@ -50,7 +50,7 @@ index 8cecdb2e69..9ede4183dd 100644
5050
pthread_t thr;
5151
pgno_t root, new_root;
5252
int rc = MDB_SUCCESS;
53-
@@ -9383,9 +9383,11 @@ mdb_env_copyfd1(MDB_env *env, HANDLE fd)
53+
@@ -9417,9 +9417,11 @@ mdb_env_copyfd1(MDB_env *env, HANDLE fd)
5454
if (rc)
5555
goto done;
5656

@@ -65,7 +65,7 @@ index 8cecdb2e69..9ede4183dd 100644
6565

6666
mp = (MDB_page *)my.mc_wbuf[0];
6767
memset(mp, 0, NUM_METAS * env->me_psize);
68-
@@ -9445,7 +9447,8 @@ finish:
68+
@@ -9479,7 +9481,8 @@ finish:
6969
my.mc_error = rc;
7070
mdb_env_cthr_toggle(&my, 1 | MDB_EOF);
7171
rc = THREAD_FINISH(thr);
@@ -75,7 +75,7 @@ index 8cecdb2e69..9ede4183dd 100644
7575

7676
done:
7777
#ifdef _WIN32
78-
@@ -9562,12 +9565,22 @@ leave:
78+
@@ -9596,12 +9599,22 @@ leave:
7979
}
8080

8181
int ESECT
@@ -100,7 +100,7 @@ index 8cecdb2e69..9ede4183dd 100644
100100
}
101101

102102
int ESECT
103-
@@ -9578,6 +9591,12 @@ mdb_env_copyfd(MDB_env *env, HANDLE fd)
103+
@@ -9612,6 +9625,12 @@ mdb_env_copyfd(MDB_env *env, HANDLE fd)
104104

105105
int ESECT
106106
mdb_env_copy2(MDB_env *env, const char *path, unsigned int flags)
@@ -113,7 +113,7 @@ index 8cecdb2e69..9ede4183dd 100644
113113
{
114114
int rc;
115115
MDB_name fname;
116-
@@ -9589,7 +9608,7 @@ mdb_env_copy2(MDB_env *env, const char *path, unsigned int flags)
116+
@@ -9623,7 +9642,7 @@ mdb_env_copy2(MDB_env *env, const char *path, unsigned int flags)
117117
mdb_fname_destroy(fname);
118118
}
119119
if (rc == MDB_SUCCESS) {

0 commit comments

Comments
 (0)