diff options
Diffstat (limited to 'storage/maria/lockman.c')
| -rw-r--r-- | storage/maria/lockman.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c index a23558e46dd..72c1e744a2e 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -189,6 +189,11 @@ static enum lockman_lock_type lock_combining_matrix[10][10]= but it cannot happen in row locks, only in table locks (S,X), or lock escalations (LS,LX) */ +#ifdef I +#define __I__WAS_DEFINED__FE21E172_945E_44E2_A26C_9371B6EC4210 +#pragma push_macro("I") +#undef I +#endif #define I GOT_THE_LOCK_NEED_TO_LOCK_A_SUBRESOURCE #define L GOT_THE_LOCK_NEED_TO_INSTANT_LOCK_A_SUBRESOURCE #define A GOT_THE_LOCK @@ -206,10 +211,15 @@ static enum lockman_getlock_result getlock_result[10][10]= { 0, x, 0, A, L, 0, x, x, 0, 0}, /* SLX */ { 0, 0, 0, L, I, 0, x, 0, 0, 0} /* LSIX */ }; -#undef I -#undef L -#undef A #undef x +#undef A +#undef L +#ifdef __I__WAS_DEFINED__FE21E172_945E_44E2_A26C_9371B6EC4210 +#pragma pop_macro("I") +#undef __I__WAS_DEFINED__FE21E172_945E_44E2_A26C_9371B6EC4210 +#else +#undef I +#endif typedef struct lockman_lock { uint64 resource; |