Merge remote branch 'origin/master'

ChangeLog

@@ -69,6 +69,8 @@ $Id$
   thanks to Lorikeet Lee.
 - patch #2983492 [sync] When asking to synchronize Structure and Data,
   only Structure is done, thanks to Ankit Gupta - ankitgupta3
+- patch #2984893 [engines] InnoDB storage page emits a warning,
+  thanks to Madhura Jayaratne - madhuracj
 
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the

libraries/engines/innodb.lib.php

@@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
             ),
             'innodb_table_locks' => array(
-                'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
+                'type'  => PMA_ENGINE_DETAILS_TYPE_BOOLEAN,
             ),
             'innodb_thread_concurrency' => array(
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,