Merge remote-tracking branch 'origin/QA_3_4'

Conflicts:
	libraries/dbi/mysql.dbi.lib.php

ChangeLog

@@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog
 - bug #3452506 [edit] Unable to move tables with triggers
 - bug #3449659 [navi] Fast filter broken with table tree
 - bug #3448485 [GUI] Firefox favicon frameset regression
+- [core] Better compatibility with mysql extension
 
 3.4.8.0 (2011-12-01)
 - bug #3425230 [interface] enum data split at space char (more space to edit)

config.sample.inc.php

@@ -31,8 +31,8 @@ $cfg['Servers'][$i]['auth_type'] = 'cookie';
 $cfg['Servers'][$i]['host'] = 'localhost';
 $cfg['Servers'][$i]['connect_type'] = 'tcp';
 $cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
+/* Select mysql if your server does not have mysqli */
+$cfg['Servers'][$i]['extension'] = 'mysqli';
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 
 /*

libraries/dbi/mysql.dbi.lib.php

@@ -408,7 +408,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
 /**
  * returns metainfo for fields in $result
  *
- * @todo add missing keys like in mysqli_query (orgname, orgtable, flags, decimals)
+ * @todo add missing keys like in mysqli_query (decimals)
  * @param   resource  $result
  * @return  array  meta info for fields in $result
  */
@@ -417,7 +417,11 @@ function PMA_DBI_get_fields_meta($result)
     $fields       = array();
     $num_fields   = mysql_num_fields($result);
     for ($i = 0; $i < $num_fields; $i++) {
-        $fields[] = mysql_fetch_field($result, $i);
+        $field = mysql_fetch_field($result, $i);
+        $field->flags = mysql_field_flags($result, $i);
+        $field->orgtable = mysql_field_table($result, $i);
+        $field->orgname = mysql_field_name($result, $i);
+        $fields[] = $field;
     }
     return $fields;
 }