diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-06 14:36:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-06 14:36:46 +0300 |
| commit | 14c6f00a9f25430f995fb42c768e19a9d2a980e8 (patch) | |
| tree | b0ff411e6ca13668124a66ded3b5bb5a7721e595 /sql/unireg.h | |
| parent | baad0f3484ec3079a09a206576290091cc823428 (diff) | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| download | mariadb-git-14c6f00a9f25430f995fb42c768e19a9d2a980e8.tar.gz | |
Merge 10.1 into 10.2
Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index b1cab841092..b0cfb3841ef 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -54,8 +54,8 @@ #define ER(X) ER_THD(current_thd, (X)) #define ER_THD_OR_DEFAULT(thd,X) ((thd) ? ER_THD(thd, (X)) : ER_DEFAULT(X)) -#define ME_INFO (ME_HOLDTANG+ME_OLDWIN+ME_NOREFRESH) -#define ME_ERROR (ME_BELL+ME_OLDWIN+ME_NOREFRESH) +#define ME_INFO (ME_HOLDTANG | ME_NOREFRESH) +#define ME_ERROR (ME_BELL | ME_NOREFRESH) #define MYF_RW MYF(MY_WME+MY_NABP) /* Vid my_read & my_write */ #define SPECIAL_USE_LOCKS 1 /* Lock used databases */ |