nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-04-10 07:25:42 -04:00
parent 1d111e12b1 d0d24a6e71
commit 3c475d8599
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -69,6 +69,8 @@ $Id$
thanks to Lorikeet Lee. thanks to Lorikeet Lee.
- patch #2983492 [sync] When asking to synchronize Structure and Data, - patch #2983492 [sync] When asking to synchronize Structure and Data,
only Structure is done, thanks to Ankit Gupta - ankitgupta3 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) 3.3.2.0 (not yet released)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

2
libraries/engines/innodb.lib.php
View File

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