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
2011-01-03 08:03:41 -05:00
parent af4b01024a 55cd2fd898
commit cfca67f422
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -132,6 +132,8 @@
3.3.10.0 (not yet released) 3.3.10.0 (not yet released)
- patch #3147400 [structure] Aria table size printed as unknown, - patch #3147400 [structure] Aria table size printed as unknown,
thanks to erickoh75 - erickoh75 thanks to erickoh75 - erickoh75
- patch #3150164 [structure] Ordering by size gives incorrect results,
thanks to Madhura Jayaratne - madhuracj
3.3.9.0 (2011-01-03) 3.3.9.0 (2011-01-03)
- bug [doc] Fix references to MySQL doc - bug [doc] Fix references to MySQL doc

8
libraries/database_interface.lib.php
View File

@@ -355,9 +355,17 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
} else { } else {
// Prepare to sort by creating array of the selected sort // Prepare to sort by creating array of the selected sort
// value to pass to array_multisort // value to pass to array_multisort
// Size = Data_length + Index_length
if ($sort_by == 'Data_length') {
foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']);
}
} else {
foreach ($each_tables as $table_name => $table_data) { foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower($table_data[$sort_by]); ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]);
} }
}
if ($sort_order == 'DESC') { if ($sort_order == 'DESC') {
array_multisort($$sort_by, SORT_DESC, $each_tables); array_multisort($$sort_by, SORT_DESC, $each_tables);