diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
| commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
| tree | a4d45b1fd0e434c23577507364fa443226676eb5 /sql/sys_vars.cc | |
| parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz | |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 0a04d20ae4b..396b4c0ae83 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -325,6 +325,14 @@ static Sys_var_long Sys_pfs_digest_size( DEFAULT(-1), BLOCK_SIZE(1)); +static Sys_var_long Sys_pfs_max_digest_length( + "performance_schema_max_digest_length", + "Maximum length considered for digest text, when stored in performance_schema tables.", + PARSED_EARLY READ_ONLY GLOBAL_VAR(pfs_param.m_max_digest_length), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024 * 1024), + DEFAULT(1024), + BLOCK_SIZE(1)); + static Sys_var_long Sys_pfs_connect_attrs_size( "performance_schema_session_connect_attrs_size", "Size of session attribute string buffer per thread." @@ -1349,7 +1357,7 @@ static Sys_var_ulong Sys_max_connect_errors( static Sys_var_uint Sys_max_digest_length( "max_digest_length", "Maximum length considered for digest text.", - PARSED_EARLY READ_ONLY GLOBAL_VAR(max_digest_length), + READ_ONLY GLOBAL_VAR(max_digest_length), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, 1024 * 1024), DEFAULT(1024), BLOCK_SIZE(1)); |