[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5796-g60b2d5a

[Michal Čihař]

The branch, master has been updated
       via  60b2d5a3a4459dfbd454b0f26ecf6c9056e13118 (commit)
       via  ef500cd23fd863e62bf810537776b45a4ed76c34 (commit)
       via  59428bb433dcd7a2df1b5500788dfabfd31641ed (commit)
       via  828d008838565b1980c67e82ff48eb087a0bcb9a (commit)
      from  0305c10f91768606b68dd184e3c61bc6d36591db (commit)


- Log -----------------------------------------------------------------
commit 60b2d5a3a4459dfbd454b0f26ecf6c9056e13118
Merge: 59428bb433dcd7a2df1b5500788dfabfd31641ed ef500cd23fd863e62bf810537776b45a4ed76c34
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 14:39:46 2010 +0200

    Merge branch 'QA_3_3'
    
    Conflicts:
    	Documentation.html
    	README
    	libraries/Config.class.php
    	translators.html

commit 59428bb433dcd7a2df1b5500788dfabfd31641ed
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 14:36:44 2010 +0200

    Whitespace cleanup.

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

Summary of changes:
 ChangeLog                        |    1 +
 libraries/common.lib.php         |    2 +-
 libraries/dbi/mysqli.dbi.lib.php |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45b5aa4..7c075c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@ $Id$
   navigation.
 
 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/common.lib.php b/libraries/common.lib.php
index 2611401..5bea0db 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2825,7 +2825,7 @@ function PMA_getTitleForTarget($target) {
 
 $mapping = array(
 	// Values for $cfg['DefaultTabTable']
-	'tbl_structure.php' =>  __('Structure'), 
+	'tbl_structure.php' =>  __('Structure'),
 	'tbl_sql.php' => __('SQL'),
 	'tbl_select.php' =>__('Search'),
 	'tbl_change.php' =>__('Insert'),
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 3a5a449..0fb46c2 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -490,8 +490,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