Merge remote-tracking branch 'mysql/5.5' into 5.5

This commit is contained in:
Sergei Golubchik 2017-04-11 10:18:04 -04:00
commit 663068c6ee
41 changed files with 379 additions and 151 deletions

View file

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