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

Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

Browse Source
This commit is contained in:
Weblate 2017-02-14 13:55:45 +01:00
commit debc40d9d7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog
- issue #12980 Better defaults when creating multi field foreign key
- issue #12976 Improved foreign key editor behavior
- issue #12958 Always show error reporting dialog on top
- issue #12693 Improved support for TokuDB
4.6.6 (2017-01-23)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

8
libraries/controllers/database/DatabaseStructureController.php
View File

@ -754,9 +754,9 @@ class DatabaseStructureController extends DatabaseController
if (isset($current_table['TABLE_ROWS'])
&& ($current_table['ENGINE'] != null || $table_is_view)
) {
// InnoDB table: we did not get an accurate row count
// InnoDB/TokuDB table: we did not get an accurate row count
$approx_rows = !$table_is_view
&& $current_table['ENGINE'] == 'InnoDB'
&& in_array($current_table['ENGINE'], array('InnoDB', 'TokuDB'))
&& !$current_table['COUNTED'];
if ($table_is_view
@ -943,7 +943,6 @@ class DatabaseStructureController extends DatabaseController
case 'ARCHIVE' :
case 'Aria' :
case 'Maria' :
case 'TokuDB' :
list($current_table, $formatted_size, $unit, $formatted_overhead,
$overhead_unit, $overhead_size, $sum_size)
= $this->getValuesForAriaTable(
@ -953,6 +952,7 @@ class DatabaseStructureController extends DatabaseController
break;
case 'InnoDB' :
case 'PBMS' :
case 'TokuDB' :
// InnoDB table: Row count is not accurate but data and index sizes are.
// PBMS table in Drizzle: TABLE_ROWS is taken from table cache,
// so it may be unavailable
@ -1062,7 +1062,7 @@ class DatabaseStructureController extends DatabaseController
) {
$formatted_size = $unit = '';
if (($current_table['ENGINE'] == 'InnoDB'
if (in_array($current_table['ENGINE'], array('InnoDB', 'TokuDB'))
&& $current_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount'])
|| !isset($current_table['TABLE_ROWS'])
) {

6
libraries/operations.lib.php
View File

@ -1358,7 +1358,7 @@ function PMA_getListofMaintainActionLink($pma_table, $url_params)
$html_output = '';
// analyze table
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB'))) {
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'))) {
$params = array(
'sql_query' => 'ANALYZE TABLE '
. Util::backquote($GLOBALS['table']),
@ -1373,7 +1373,7 @@ function PMA_getListofMaintainActionLink($pma_table, $url_params)
}
// check table
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB'))) {
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'TOKUDB'))) {
$params = array(
'sql_query' => 'CHECK TABLE '
. Util::backquote($GLOBALS['table']),
@ -1433,7 +1433,7 @@ function PMA_getListofMaintainActionLink($pma_table, $url_params)
);
// optimize table
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB'))) {
if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'))) {
$params = array(
'sql_query' => 'OPTIMIZE TABLE '
. Util::backquote($GLOBALS['table']),