diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
| commit | fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf (patch) | |
| tree | 0c7d096327ae1ce637c2042f7daee1589cf36e90 /sql/sql_acl.h | |
| parent | 6feb74c4b21143ece69bcc1e04474a528f122cdb (diff) | |
| parent | 6d49ef49e57708b4bbc6b428c9e6228685e59452 (diff) | |
| download | mariadb-git-fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index e3dba20422d..e299844a71a 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -189,8 +189,12 @@ extern LEX_CSTRING current_user_and_current_role; static inline int access_denied_error_code(int passwd_used) { +#ifdef mysqld_error_find_printf_error_used + return 0; +#else return passwd_used == 2 ? ER_ACCESS_DENIED_NO_PASSWORD_ERROR : ER_ACCESS_DENIED_ERROR; +#endif } /* prototypes */ |