From 83d458aa05286397198bcd0674eeeb610849ef5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 26 Jul 2010 15:45:36 +0200 Subject: [PATCH] Revert "bug #3031705 [core] Do not use CONCAT for DECIMAL fields." This reverts commit ef500cd23fd863e62bf810537776b45a4ed76c34. We probably need to use CONCAT still, just the other side should be converted to string as well. --- ChangeLog | 1 - libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7cb453b0..5d318214a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,6 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ 3.3.6.0 (not yet released) -- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. - bug #3033063 [core] Navi gets wrong db name 3.3.5.0 (not yet released) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index fd35eb4a9..913bce627 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] = 'decimal'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int';