[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1416-g3c475d8

[Marc Delisle]

The branch, master has been updated
       via  3c475d85992a844f416f63c8d49c21217532c7e3 (commit)
       via  d0d24a6e714646a3660c64549382c07375967feb (commit)
      from  1d111e12b10a9908307fcb94ac2aa829ec56adb9 (commit)


- Log -----------------------------------------------------------------
commit 3c475d85992a844f416f63c8d49c21217532c7e3
Merge: 1d111e12b10a9908307fcb94ac2aa829ec56adb9 d0d24a6e714646a3660c64549382c07375967feb
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Apr 10 07:25:42 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    2 ++
 libraries/engines/innodb.lib.php |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbf532c..9d9b8ae 100644
--- a/ChangeLog
+++ b/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
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index 4d7caba..b2301c1 100644
--- a/libraries/engines/innodb.lib.php
+++ b/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,


hooks/post-receive
-- 
phpMyAdmin