[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-19-gd0d24a6

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  d0d24a6e714646a3660c64549382c07375967feb (commit)
      from  a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit)


- Log -----------------------------------------------------------------
commit d0d24a6e714646a3660c64549382c07375967feb
Author: Madhura Jayaratne <madhuracj at users.sourceforge.net>
Date:   Sat Apr 10 07:22:37 2010 -0400

    Patch #2984893 - InnoDB storage page emits warning

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

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 718ac6b..ab8e8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   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 894d7ed..44e53f7 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