merge from trunk

This commit is contained in:
Bjorn Munch 2010-03-09 16:15:15 +01:00
commit bf98cc7bcc

View File

@ -101,7 +101,7 @@ enum options_client
/** /**
First mysql version supporting the performance schema. First mysql version supporting the performance schema.
*/ */
#define FIRST_PERFORMANCE_SCHEMA_VERSION 50599 #define FIRST_PERFORMANCE_SCHEMA_VERSION 50503
/** /**
Name of the performance schema database. Name of the performance schema database.