Merge mysql-5.1 to mysql-5.5.

This commit is contained in:
Marko Mäkelä 2011-10-12 09:21:33 +03:00
commit 5dc19b9ce1
16 changed files with 276 additions and 424 deletions

View file

@ -670,7 +670,6 @@ or row lock! */
#define SYNC_LOG_FLUSH_ORDER 147
#define SYNC_RECV 168
#define SYNC_WORK_QUEUE 162
#define SYNC_SEARCH_SYS_CONF 161 /* for assigning btr_search_enabled */
#define SYNC_SEARCH_SYS 160 /* NOTE that if we have a memory
heap that can be extended to the
buffer pool, its logical level is