nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "bug #3031705 [core] Do not use CONCAT for DECIMAL fields."

Browse Source 
This reverts commit ef500cd23f.

We probably need to use CONCAT still, just the other side should be
converted to string as well.
This commit is contained in:
Michal Čihař
2010-07-26 15:45:36 +02:00
parent 053d6ca88e
commit 83d458aa05
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -6,7 +6,6 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
3.3.6.0 (not yet released) 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 - bug #3033063 [core] Navi gets wrong db name
3.3.5.0 (not yet released) 3.3.5.0 (not yet released)

4
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -493,8 +493,8 @@ function PMA_DBI_get_fields_meta($result)
{ {
// Build an associative array for a type look up // Build an associative array for a type look up
$typeAr = array(); $typeAr = array();
$typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_DECIMAL] = 'real';
$typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real';
$typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_BIT] = 'int';
$typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int';
$typeAr[MYSQLI_TYPE_SHORT] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int';