The branch, QA_3_4 has been updated
via da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit)
via 91241f71d329d6692c9761ded0b19d6f75730fec (commit)
via cec8f1b0941595ea7673fa990b3291fd564220c0 (commit)
from 396e5716f89d291f366266e639c26e2ed8391dd2 (commit)
- Log -----------------------------------------------------------------
commit da62d86238949a5dbb42f64dcdfed81a4fc5b36a
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Dec 14 10:00:01 2011 +0100
These are done and we do not seem to use decimals
commit 91241f71d329d6692c9761ded0b19d6f75730fec
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Dec 14 09:58:47 2011 +0100
Fill orgtable and orgname attributes
commit cec8f1b0941595ea7673fa990b3291fd564220c0
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Dec 14 09:56:02 2011 +0100
Add actually some sane value to field flags
-----------------------------------------------------------------------
Summary of changes:
libraries/dbi/mysql.dbi.lib.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 96b6933..f959539 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -427,7 +427,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
}
/**
- * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals)
+ * @todo add missing keys like in from mysqli_query (decimals)
*/
function PMA_DBI_get_fields_meta($result)
{
@@ -435,7 +435,9 @@ function PMA_DBI_get_fields_meta($result)
$num_fields = mysql_num_fields($result);
for ($i = 0; $i < $num_fields; $i++) {
$field = mysql_fetch_field($result, $i);
- $field->flags = '';
+ $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