The branch, QA_3_3 has been updated via ef500cd23fd863e62bf810537776b45a4ed76c34 (commit) from 828d008838565b1980c67e82ff48eb087a0bcb9a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f1afa7..5323907 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $ 3.3.6.0 (not yet released) +- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce6..fd35eb4 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -493,8 +493,8 @@ function PMA_DBI_get_fields_meta($result) { // Build an associative array for a type look up $typeAr = array(); - $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; hooks/post-receive -- phpMyAdmin