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-26 16:38:46 -04:00
parent 5cb5afedbb 06c8fa0abb
commit ba0ca1851a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -100,6 +100,7 @@ $Id$
- bug #2974067 [display] non-binary fields shown as hex
- bug #2983065 [operations] Error when changing from Maria to MyISAM engine
- bug #2975408 [tracking] Data too long for column data_sql
- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL
3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the

14
tbl_tracking.php
View File

@@ -416,8 +416,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<?php
$style = 'odd';
foreach ($data['ddlog'] as $entry) {
$parsed_sql = PMA_SQP_parse($entry['statement']);
$statement = PMA_formatSql($parsed_sql);
if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
} else {
$statement = PMA_formatSql(PMA_SQP_parse($entry['statement']));
}
$timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to &&
@@ -464,8 +467,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<?php
$style = 'odd';
foreach ($data['dmlog'] as $entry) {
$parsed_sql = PMA_SQP_parse($entry['statement']);
$statement = PMA_formatSql($parsed_sql);
if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
} else {
$statement = PMA_formatSql(PMA_SQP_parse($entry['statement']));
}
$timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to &&