database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

System Versioning 1.0 pre8

Browse Source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov
2018-01-10 12:36:55 +03:00
parent 26971c9aea 0b597d3ab2
commit c59c1a0736
353 changed files with 12715 additions and 8094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.h
View File

@ -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 */