diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:08:46 +0300 |
commit | eae968f62d285de97ed607c87bc131cd863d5d03 (patch) | |
tree | b86dacfaf9e1340161d3675204544a4db937eb05 /storage/innobase/include/sync0types.h | |
parent | 101ddc5e2708e4e32f1aaa7a02fe85f0da95b73a (diff) | |
parent | bafc5c1321a7dff5f2da292111bf98fed9d1658d (diff) | |
download | mariadb-git-eae968f62d285de97ed607c87bc131cd863d5d03.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/include/sync0types.h')
-rw-r--r-- | storage/innobase/include/sync0types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h index 32fdc89d6e4..339154a9615 100644 --- a/storage/innobase/include/sync0types.h +++ b/storage/innobase/include/sync0types.h @@ -360,7 +360,6 @@ enum latch_id_t { LATCH_ID_SCRUB_STAT_MUTEX, LATCH_ID_DEFRAGMENT_MUTEX, LATCH_ID_BTR_DEFRAGMENT_MUTEX, - LATCH_ID_FIL_CRYPT_MUTEX, LATCH_ID_FIL_CRYPT_STAT_MUTEX, LATCH_ID_FIL_CRYPT_DATA_MUTEX, LATCH_ID_FIL_CRYPT_THREADS_MUTEX, |