Merge remote branch 'origin/master'

This commit is contained in:
ninadsp
2010-06-29 23:54:01 +05:30
11 changed files with 4 additions and 25 deletions

View File

@@ -95,7 +95,6 @@ if (!isset($param) || $param[0] == '') {
PMA_DBI_free_result($result);
unset($result, $type);
// <markus@noga.de>
// retrieve keys into foreign fields, if any
// check also foreigners even if relwork is FALSE (to get
// foreign keys from innodb)
@@ -183,7 +182,6 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
</td>
<td>
<?php
// <markus@noga.de>
$field = $fields_list[$i];
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');