[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24788-gcdffe9f

[Michal Čihař]

The branch, master has been updated
       via  cdffe9fb978ce108274ac414910b2eec7a1e224a (commit)
       via  458e015ec2bd5f887b3240faef0ca36f8474d3bf (commit)
       via  da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit)
       via  91241f71d329d6692c9761ded0b19d6f75730fec (commit)
       via  cec8f1b0941595ea7673fa990b3291fd564220c0 (commit)
       via  396e5716f89d291f366266e639c26e2ed8391dd2 (commit)
       via  a074b4c6e28b044670d21dec791ad0f909eba251 (commit)
       via  ea64f8f731928cfed87f7149a39dc797af8ce08a (commit)
      from  de11d39fd6f8c055aef5042212c1e42092a4d159 (commit)


- Log -----------------------------------------------------------------
commit cdffe9fb978ce108274ac414910b2eec7a1e224a
Merge: de11d39 458e015
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Dec 14 10:06:36 2011 +0100

    Merge remote-tracking branch 'origin/QA_3_4'
    
    Conflicts:
    	libraries/dbi/mysql.dbi.lib.php

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |    1 +
 config.sample.inc.php           |    4 ++--
 libraries/dbi/mysql.dbi.lib.php |    8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77ebdcf..7f9d873 100644
--- a/ChangeLog
+++ b/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)
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 0eab148..d392003 100644
--- a/config.sample.inc.php
+++ b/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;
 
 /*
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 4e41149..6e6b7e2 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/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;
 }


hooks/post-receive
-- 
phpMyAdmin