Bug 1011047: mysqld can't startup when a plugin was installed.
Move userstat initialization a bit earlier. It should be
initialized for the time when mysql.plugin table accessed.
Merge fix for bug 1011047 from 5.1 series.
Bug 1218417: errors in i_s.cc
i_s use symbols which defined in header files without including them
trx0trx.h:
TRX_QUE_STATE_STR_MAX_LEN
dict0load.h:
SYS_TABLES
SYS_INDEXES
SYS_COLUMNS
SYS_FIELDS
DICT_TABLE_LOAD_FROM_RECORD
DICT_TABLE_LOAD_FROM_CACHE
dict_process_sys_indexes_rec
dict_process_sys_fields_rec
dict_getnext_system
dict_startscan_system
buf0lru.h:
buf_LRU_file_dump
buf_LRU_file_restore
srv0srv.h:
srv_max_changed_pages
Bug is likely a merge regression.
Automerge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1218417
Automerge lp:~sergei.glushchenko/percona-server/5.5-ST36241-ps-bug1011047