Merge branch '5.5' into 10.0

This commit is contained in:
Sergei Golubchik 2017-04-21 18:34:06 +02:00
commit 8d75a7533e
57 changed files with 670 additions and 173 deletions

View file

@ -117,4 +117,3 @@ enum options_client
Name of the performance schema database.
*/
#define PERFORMANCE_SCHEMA_DB_NAME "performance_schema"