Merge tag 'mariadb-10.0.21' into 10.0-galera

This commit is contained in:
Nirbhay Choubey 2015-08-08 14:21:22 -04:00
commit 91acc8b16f
348 changed files with 8233 additions and 6380 deletions

View file

@ -5974,8 +5974,6 @@ int mysqld_main(int argc, char **argv)
pfs_param.m_hints.m_table_open_cache= tc_size;
pfs_param.m_hints.m_max_connections= max_connections;
pfs_param.m_hints.m_open_files_limit= open_files_limit;
/* the performance schema digest size is the same as the SQL layer */
pfs_param.m_max_digest_length= max_digest_length;
PSI_hook= initialize_performance_schema(&pfs_param);
if (PSI_hook == NULL)
{