Merge remote branch 'origin/master'

This commit is contained in:
ninadsp
2010-06-15 15:39:51 +05:30
70 changed files with 1748 additions and 2132 deletions

View File

@@ -320,7 +320,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
switch ($cfg['SQP']['fmtType']) {
case 'none':
if ($unparsed_sql != '') {
$formatted_sql = "<pre>\n" . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n</pre>";
$formatted_sql = '<span class="inner_sql"><pre>' . "\n" . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n" . '</pre></span>';
} else {
$formatted_sql = PMA_SQP_formatNone($parsed_sql);
}

View File

@@ -305,7 +305,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
function getPageStatus()
{
return '<pre id="pre_innodb_status">' . "\n"
. htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;')) . "\n"
. htmlspecialchars(PMA_DBI_fetch_value('SHOW INNODB STATUS;', 0, 'Status')) . "\n"
. '</pre>' . "\n";
}

View File

@@ -84,6 +84,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
{
global $import_run_buffer, $go_sql, $complete_query, $display_query,
$sql_query, $my_die, $error, $reload,
$last_query_with_results,
$skip_queries, $executed_queries, $max_sql_len, $read_multiply,
$cfg, $sql_query_disabled, $db, $run_query, $is_superuser;
$read_multiply = 1;
@@ -143,6 +144,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
$a_aff_rows = (int)@PMA_DBI_affected_rows();
if ($a_num_rows > 0) {
$msg .= __('Rows'). ': ' . $a_num_rows;
$last_query_with_results = $import_run_buffer['sql'];
} elseif ($a_aff_rows > 0) {
$message = PMA_Message::affected_rows($a_aff_rows);
$msg .= $message->getMessage();

View File

@@ -2092,6 +2092,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$docu = TRUE;
break;
} // end switch
// inner_sql is a span that exists for all cases
// of $cfg['SQP']['fmtType'] to make possible a replacement
// for inline editing
$str .= '<span class="inner_sql">';
$close_docu_link = false;
$indent = 0;
$bracketlevel = 0;
@@ -2578,7 +2582,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$str .= '</a>';
$close_docu_link = false;
}
// close inner_sql span
$str .= '</span>';
if ($mode=='color') {
// close syntax span
$str .= '</span>';
}