diff options
author | xmujay <xmujay@gmail.com> | 2013-06-04 19:51:36 +0400 |
---|---|---|
committer | xmujay <xmujay@gmail.com> | 2013-06-04 19:51:36 +0400 |
commit | c51e6d66a16269dfcbd956b7f1fb00726d94d460 (patch) | |
tree | 098e513291e576e85f7b15e671fd18143dc14722 /server_status.php | |
parent | e7a284569095edcc50c9726ce1b5293228674722 (diff) |
split long lines
Diffstat (limited to 'server_status.php')
-rw-r--r-- | server_status.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/server_status.php b/server_status.php index 279bfb1b3d..690432e74e 100644 --- a/server_status.php +++ b/server_status.php @@ -399,6 +399,8 @@ function PMA_getServerProcesslistHtml($ServerStatusData) $sortable_columns_count = count($sortable_columns); if (PMA_DRIZZLE) { + $left_str = 'left(p.info, ' + . (int)$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] . ')'; $sql_query = "SELECT p.id AS Id, p.username AS User, @@ -406,18 +408,17 @@ function PMA_getServerProcesslistHtml($ServerStatusData) p.db AS db, p.command AS Command, p.time AS Time, - p.state AS State, - " . ($show_full_sql - ? 's.query' - : 'left(p.info, ' . (int)$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] . ')') . " AS Info - FROM data_dictionary.PROCESSLIST p - " . ($show_full_sql + p.state AS State," + . ($show_full_sql ? 's.query' : $left_str ) + . " AS Info FROM data_dictionary.PROCESSLIST p " + . ($show_full_sql ? 'LEFT JOIN data_dictionary.SESSIONS s ON s.session_id = p.id' : ''); if (! empty($_REQUEST['order_by_field']) && ! empty($_REQUEST['sort_order']) ) { - $sql_query .= ' ORDER BY p.' . $_REQUEST['order_by_field'] . ' ' . $_REQUEST['sort_order']; + $sql_query .= ' ORDER BY p.' . $_REQUEST['order_by_field'] . ' ' + . $_REQUEST['sort_order']; } } else { $sql_query = $show_full_sql |