-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=OFF

Problem: Build failure while building MySQL-5.6 when 
performance schema is disabled.(i.e. compiling using the
option -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF).

Background: A few misplaced comma(',') in the the
conditionally included code has caused this problem.

Fix: Changed the comma positions so that the conditionally
included code compiles properly.