1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge branch 'github/10.3' into bb-10.3-temporal

This commit is contained in:
Sergei Golubchik
2018-01-17 00:45:02 +01:00
186 changed files with 3130 additions and 1853 deletions

View File

@@ -152,7 +152,7 @@ enum enum_indicator_type
*/
#define SCRAMBLE_LENGTH 20
#define SCRAMBLE_LENGTH_323 8
/* length of password stored in the db: new passwords are preceeded with '*' */
/* length of password stored in the db: new passwords are preceded with '*' */
#define SCRAMBLED_PASSWORD_CHAR_LENGTH (SCRAMBLE_LENGTH*2+1)
#define SCRAMBLED_PASSWORD_CHAR_LENGTH_323 (SCRAMBLE_LENGTH_323*2)
@@ -299,7 +299,7 @@ enum enum_indicator_type
#endif
/*
Gather all possible capabilites (flags) supported by the server
Gather all possible capabilities (flags) supported by the server
MARIADB_* flags supported only by MariaDB connector(s).
*/