diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
| commit | c59c1a0736e36e9c66f798d199a124f362353377 (patch) | |
| tree | 80ee18faad049687b0b4f0e2f147caf870d68390 /sql/sql_acl.h | |
| parent | 26971c9aea67a62f348cd105348a8dc4407bcf4a (diff) | |
| parent | 0b597d3ab2494bc1db97cc4a30d697a5fdf48c21 (diff) | |
| download | mariadb-git-c59c1a0736e36e9c66f798d199a124f362353377.tar.gz | |
System Versioning 1.0 pre8
Merge branch '10.3' into trunk
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 cff59036867..bafb9ca23d8 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -198,8 +198,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 */ |